diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2010-10-04 17:08:35 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2010-10-04 17:08:35 +0200 |
| commit | 20fa3d7d382da810c49418c42d7b9f9d642521c6 (patch) | |
| tree | 8bef68820157d93e8e353180afc51bdd02a4ac1e | |
| parent | 40ee088f68a452ac2ed19622481c73d6d38c7ec3 (diff) | |
| parent | bf18e8529afc96590ee96c4d5f3c75de89ae7e63 (diff) | |
| download | mariadb-git-20fa3d7d382da810c49418c42d7b9f9d642521c6.tar.gz | |
Merge 56267 into 5.5-bugteam.
| -rw-r--r-- | scripts/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 0c9177c79c5..9b4b598a682 100644 --- 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") |