List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:October 4 2010 2:59pm
Subject:bzr commit into mysql-trunk-bugfixing branch (joerg:3282)
View as plain text  
#At file:///MySQL/REPO/Vtu/bug56267-trunk/ based on revid:alik@stripped

 3282 Joerg Bruehe	2010-10-04 [merge]
      Auto-upmerge the 56267 fix from 5.5 to "trunk".

    modified:
      scripts/CMakeLists.txt
=== modified file 'scripts/CMakeLists.txt'
--- a/scripts/CMakeLists.txt	2010-09-13 10:26:57 +0000
+++ b/scripts/CMakeLists.txt	2010-10-04 14:58:50 +0000
@@ -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")


Attachment: [text/bzr-bundle] bzr/joerg@mysql.com-20101004145850-sqrxkna9j82kuy90.bundle
Thread
bzr commit into mysql-trunk-bugfixing branch (joerg:3282) Joerg Bruehe4 Oct
  • RE: bzr commit into mysql-trunk-bugfixing branch (joerg:3282)Vladislav Vaintroub4 Oct
    • Re: bzr commit into mysql-trunk-bugfixing branch (joerg:3282)Joerg Bruehe5 Oct