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

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

@ -1,5 +1,5 @@
find_path(MALLOC_DIR NAMES malloc.h ) find_path(MALLOC_DIR NAMES malloc.h )
if(NOT "${MALLOC_DIR}" MATCHES "MALLOC_DIR-NOTFOUND")
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows") if("${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
# If it's cross-compilation and target is windows, first compile MSIZE_CHECK.exe # If it's cross-compilation and target is windows, first compile MSIZE_CHECK.exe
@ -44,3 +44,6 @@ else()
message(STATUS "Usable _msize was not detected") message(STATUS "Usable _msize was not detected")
set(MSIZE_FOUND FALSE) set(MSIZE_FOUND FALSE)
endif() endif()
else()
set(MSIZE_FOUND FALSE)
endif()

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

@ -1,5 +1,5 @@
find_path(MALLOC_DIR NAMES malloc/malloc.h ) find_path(MALLOC_DIR NAMES malloc/malloc.h )
if(NOT "${MALLOC_DIR}" MATCHES "MALLOC_DIR-NOTFOUND")
try_run(MALLOCSIZE_CHECK MALLOCSIZE_CHECK_BUILD try_run(MALLOCSIZE_CHECK MALLOCSIZE_CHECK_BUILD
${LEAN_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp ${LEAN_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
${LEAN_SOURCE_DIR}/cmake/Modules/CheckMallocSize.cc ${LEAN_SOURCE_DIR}/cmake/Modules/CheckMallocSize.cc
@ -13,3 +13,6 @@ else()
message(STATUS "Usable malloc_size was not detected") message(STATUS "Usable malloc_size was not detected")
set(MALLOCSIZE_FOUND FALSE) set(MALLOCSIZE_FOUND FALSE)
endif() endif()
else()
set(MALLOCSIZE_FOUND FALSE)
endif()

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

@ -1,5 +1,5 @@
find_path(MALLOC_DIR NAMES malloc.h ) find_path(MALLOC_DIR NAMES malloc.h )
if(NOT "${MALLOC_DIR}" MATCHES "MALLOC_DIR-NOTFOUND")
try_run(MUS_CHECK MUS_CHECK_BUILD try_run(MUS_CHECK MUS_CHECK_BUILD
${LEAN_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp ${LEAN_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
${LEAN_SOURCE_DIR}/cmake/Modules/CheckMallocUsableSize.cc ${LEAN_SOURCE_DIR}/cmake/Modules/CheckMallocUsableSize.cc
@ -13,6 +13,6 @@ else()
message(STATUS "Usable malloc_usable_size was not detected") message(STATUS "Usable malloc_usable_size was not detected")
set(MUS_FOUND FALSE) set(MUS_FOUND FALSE)
endif() endif()
else()
set(MUS_FOUND FALSE)
endif()