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

Update Find{MSize,MallocSize,MallocUsableSize}.cmake to handle the case where find_path fails

Browse source
This commit is contained in:
Soonho Kong 2013-09-21 00:10:25 -07:00
parent 48318511f2
commit 80581a76bb
3 changed files with 66 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/cmake/Modules/FindMSize.cmake
View file

@ -1,6 +1,6 @@
find_path(MALLOC_DIR NAMES malloc.h )
if(CMAKE_CROSSCOMPILING)
if(NOT "${MALLOC_DIR}" MATCHES "MALLOC_DIR-NOTFOUND")
if(CMAKE_CROSSCOMPILING)
if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
# If it's cross-compilation and target is windows, first compile MSIZE_CHECK.exe
execute_process(COMMAND ${CMAKE_CXX_COMPILER}
@ -29,18 +29,21 @@ if(CMAKE_CROSSCOMPILING)
# It's cross-compilation but the target is not Windows
set(MSIZE_FOUND FALSE)
endif()
else()
else()
try_run(MSIZE_CHECK MSIZE_CHECK_BUILD
${LEAN_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
${LEAN_SOURCE_DIR}/cmake/Modules/CheckMSize.cc
CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${MALLOC_DIR}
RUN_OUTPUT_VARIABLE MSIZE_TRY_OUT)
endif()
endif()
if("${MSIZE_CHECK_BUILD}" MATCHES "TRUE" AND "${MSIZE_CHECK}" MATCHES "0")
if("${MSIZE_CHECK_BUILD}" MATCHES "TRUE" AND "${MSIZE_CHECK}" MATCHES "0")
message(STATUS "Found _msize " "${MSIZE_UNTESTED}")
set(MSIZE_FOUND TRUE)
else()
else()
message(STATUS "Usable _msize was not detected")
set(MSIZE_FOUND FALSE)
endif()
else()
set(MSIZE_FOUND FALSE)
endif()

11
src/cmake/Modules/FindMallocSize.cmake
View file

@ -1,15 +1,18 @@
find_path(MALLOC_DIR NAMES malloc/malloc.h )
try_run(MALLOCSIZE_CHECK MALLOCSIZE_CHECK_BUILD
if(NOT "${MALLOC_DIR}" MATCHES "MALLOC_DIR-NOTFOUND")
try_run(MALLOCSIZE_CHECK MALLOCSIZE_CHECK_BUILD
${LEAN_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
${LEAN_SOURCE_DIR}/cmake/Modules/CheckMallocSize.cc
CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${MALLOC_DIR}
RUN_OUTPUT_VARIABLE MALLOCSIZE_TRY_OUT)
if("${MALLOCSIZE_CHECK_BUILD}" MATCHES "TRUE" AND "${MALLOCSIZE_CHECK}" MATCHES "0")
if("${MALLOCSIZE_CHECK_BUILD}" MATCHES "TRUE" AND "${MALLOCSIZE_CHECK}" MATCHES "0")
message(STATUS "Found malloc_size " "${MALLOCSIZE_UNTESTED}")
set(MALLOCSIZE_FOUND TRUE)
else()
else()
message(STATUS "Usable malloc_size was not detected")
set(MALLOCSIZE_FOUND FALSE)
endif()
else()
set(MALLOCSIZE_FOUND FALSE)
endif()

14
src/cmake/Modules/FindMallocUsableSize.cmake
View file

@ -1,18 +1,18 @@
find_path(MALLOC_DIR NAMES malloc.h )
try_run(MUS_CHECK MUS_CHECK_BUILD
if(NOT "${MALLOC_DIR}" MATCHES "MALLOC_DIR-NOTFOUND")
try_run(MUS_CHECK MUS_CHECK_BUILD
${LEAN_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
${LEAN_SOURCE_DIR}/cmake/Modules/CheckMallocUsableSize.cc
CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${MALLOC_DIR}
RUN_OUTPUT_VARIABLE MUS_TRY_OUT)
if("${MUS_CHECK_BUILD}" MATCHES "TRUE" AND "${MUS_CHECK}" MATCHES "0")
if("${MUS_CHECK_BUILD}" MATCHES "TRUE" AND "${MUS_CHECK}" MATCHES "0")
message(STATUS "Found malloc_usable_size")
set(MUS_FOUND TRUE)
else()
else()
message(STATUS "Usable malloc_usable_size was not detected")
set(MUS_FOUND FALSE)
endif()
else()
set(MUS_FOUND FALSE)
endif()