diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-10-04 18:26:34 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-10-04 18:26:34 +0300 |
| commit | 7f491aea4eef36ca52341645fe8de6abeb6eb666 (patch) | |
| tree | 5ffa574bcbfabb5cdba3af296f1e10468ef2bd71 | |
| parent | 051fbd2476ecef84a0304b90982d9c105d867ed9 (diff) | |
| parent | fdadaf0783722c79eda80241a88c1fa18eefd72f (diff) | |
| download | mariadb-git-7f491aea4eef36ca52341645fe8de6abeb6eb666.tar.gz | |
merge
| -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") |