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
commit01edb593fefab7c6c53de5b96eb297bd8d6b7db5 (patch)
tree5ffa574bcbfabb5cdba3af296f1e10468ef2bd71 /scripts
parent5dbfc861be4d2a8f1e41002cfebc91f7405c9a29 (diff)
parentbdec3cbfb0f252039417ef8484195b42c874a309 (diff)
downloadmariadb-git-01edb593fefab7c6c53de5b96eb297bd8d6b7db5.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")