Merge 56267 into 5.5-bugteam.

20fa3d7d · Joerg Bruehe · 40ee088f · bf18e852 · 20fa3d7d
Commit 20fa3d7d authored Oct 04, 2010 by Joerg Bruehe
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

scripts/CMakeLists.txt scripts/CMakeLists.txt +4 -5

No files found.
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -81,12 +81,11 @@ INSTALL(FILES
 )
 # TCMalloc hacks
-IF($ENV{MALLOC_LIB})
-  SET(MALLOC_LIB $ENV{MALLOC_LIB} CACHE STRING "malloc library")
-ENDIF()
 IF(MALLOC_LIB)
-  INSTALL(FILES ${MALLOC_LIB} DESTINATION lib OPTIONAL)
+  MESSAGE("Using tcmalloc '${MALLOC_LIB}'")
+  INSTALL(FILES ${MALLOC_LIB} DESTINATION ${INSTALL_LIBDIR} OPTIONAL)
+ELSE()
+  MESSAGE("No 'MALLOC_LIB' variable")
 ENDIF()
 IF(CMAKE_GENERATOR MATCHES "Makefiles")