bzr commit into mysql-5.5 branch (joerg:3083) Bug#56267

[Joerg Bruehe]

#At file:///MySQL/REPO/V55/itch-5.5/ based on revid:joerg@stripped

 3083 Joerg Bruehe	2010-10-01
      Next attempt at bug#56267: Use a "-D" parameter to cmake.

    modified:
      scripts/CMakeLists.txt
=== modified file 'scripts/CMakeLists.txt'
--- a/scripts/CMakeLists.txt	2010-10-01 08:55:36 +0000
+++ b/scripts/CMakeLists.txt	2010-10-01 13:36:56 +0000
@@ -81,15 +81,8 @@ INSTALL(FILES 
 )
 
 # TCMalloc hacks
-IF($ENV{MALLOC_LIB})
-  SET(MALLOC_LIB $ENV{MALLOC_LIB} CACHE STRING "malloc library")
-  MESSAGE("Using tcmalloc '${MALLOC_LIB}'")
-  MESSAGE("Copied from '$ENV{MALLOC_SOURCE}'")
-ELSE()
-  MESSAGE("No 'MALLOC_LIB' in environment")
-ENDIF()
-
 IF(MALLOC_LIB)
+  MESSAGE("Using tcmalloc '${MALLOC_LIB}'")
   INSTALL(FILES ${MALLOC_LIB} DESTINATION ${INSTALL_LIBDIR} OPTIONAL)
 ELSE()
   MESSAGE("No 'MALLOC_LIB' variable")


Attachment: [text/bzr-bundle] bzr/[e-mail]