summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-10-04 18:26:34 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-10-04 18:26:34 +0300
commit57bb4dee2e8c88688350d2ba1674edf984928191 (patch)
tree5ffa574bcbfabb5cdba3af296f1e10468ef2bd71 /scripts
parentf206172ba99fc209ba2ed71b6267d2d5c74b5d6c (diff)
parent20fa3d7d382da810c49418c42d7b9f9d642521c6 (diff)
downloadmariadb-git-57bb4dee2e8c88688350d2ba1674edf984928191.tar.gz
merge
Diffstat (limited to 'scripts')
-rw-r--r--scripts/CMakeLists.txt9
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")