> -----Original Message-----
> From: Joerg Bruehe [mailto:joerg@stripped]
> Sent: Monday, October 04, 2010 4:59 PM
> To: commits@stripped
> Subject: bzr commit into mysql-trunk-bugfixing branch (joerg:3282)
>
> #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()
Joerg, can we silence up the debug output somewhat :)? Should every developer get 'No
'MALLOC_LIB' variable' ? Should he be worried
when it sees it? On a more serious note, why don't you store the full content of
CMakeCache.txt prior do "make" , in your pushbuild
environment somewhere, or print the content of it, as you currently do with my_config.h ?
If MALLOC_LIB is set with -D, you will
find it there, in CMakeCache.txt. And many other interesting things too, that will help
your team to analyze errors.
> IF(CMAKE_GENERATOR MATCHES "Makefiles")
