Commit fdadaf07 authored by Joerg Bruehe's avatar Joerg Bruehe

Merge 56267 into 5.5-bugteam.

parents 774a5778 7cb89424
...@@ -81,12 +81,11 @@ INSTALL(FILES ...@@ -81,12 +81,11 @@ INSTALL(FILES
) )
# TCMalloc hacks # TCMalloc hacks
IF($ENV{MALLOC_LIB})
SET(MALLOC_LIB $ENV{MALLOC_LIB} CACHE STRING "malloc library")
ENDIF()
IF(MALLOC_LIB) 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() ENDIF()
IF(CMAKE_GENERATOR MATCHES "Makefiles") IF(CMAKE_GENERATOR MATCHES "Makefiles")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment