michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bugs in Tcmalloc detection.

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2013-09-19 23:52:50 -07:00
parent a7a5426ff5
commit 9d1266c972
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/CMakeLists.txt
View file

@ -60,6 +60,7 @@ set(EXTRA_LIBS ${EXTRA_LIBS} ${MPFR_LIBRARIES})
# tcmalloc # tcmalloc
option(TCMALLOC "TCMALLOC" ON) option(TCMALLOC "TCMALLOC" ON)
if("${TCMALLOC}" MATCHES "ON") if("${TCMALLOC}" MATCHES "ON")
find_package(Tcmalloc)
if(${TCMALLOC_FOUND}) if(${TCMALLOC_FOUND})
set(EXTRA_LIBS ${EXTRA_LIBS} ${TCMALLOC_LIBRARIES}) set(EXTRA_LIBS ${EXTRA_LIBS} ${TCMALLOC_LIBRARIES})
message(STATUS "Using tcmalloc.") message(STATUS "Using tcmalloc.")

2
src/cmake/Modules/FindTcmalloc.cmake
View file

@ -13,7 +13,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCMALLOC DEFAULT_MSG TCMALLOC_INCLUDE_DIR TCMA
if (TCMALLOC_FOUND) if (TCMALLOC_FOUND)
try_run(TC_CHECK TC_CHECK_BUILD try_run(TC_CHECK TC_CHECK_BUILD
${LEAN_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp ${LEAN_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
${LEAN_SOURCE_DIR}/cmake/CheckTcmalloc.cc ${LEAN_SOURCE_DIR}/cmake/Modules/CheckTcmalloc.cc
CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${TCMALLOC_INCLUDE_DIR} CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${TCMALLOC_INCLUDE_DIR}
-DLINK_LIBRARIES=${TCMALLOC_LIBRARIES} -DLINK_LIBRARIES=${TCMALLOC_LIBRARIES}
RUN_OUTPUT_VARIABLE TC_TRY_OUT) RUN_OUTPUT_VARIABLE TC_TRY_OUT)