diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CheckCSourceRuns.cmake | 4 | ||||
| -rw-r--r-- | Modules/CheckCXXSourceRuns.cmake | 5 | ||||
| -rw-r--r-- | Modules/FindThreads.cmake | 2 | ||||
| -rw-r--r-- | Modules/TestBigEndian.cmake | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/Modules/CheckCSourceRuns.cmake b/Modules/CheckCSourceRuns.cmake index d843e9a..555b352 100644 --- a/Modules/CheckCSourceRuns.cmake +++ b/Modules/CheckCSourceRuns.cmake @@ -2,7 +2,7 @@ # CHECK_C_SOURCE_RUNS(SOURCE VAR) # - macro which checks if the source code runs # SOURCE - source code to try to compile -# VAR - variable to store size if the type exists. +# VAR - variable to store the result, 1 for success, empty for failure # # The following variables may be set before calling this macro to # modify the way the check is run: @@ -39,7 +39,7 @@ MACRO(CHECK_C_SOURCE_RUNS SOURCE VAR) CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} "${CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES}" "${CHECK_C_SOURCE_COMPILES_ADD_INCLUDES}" - OUTPUT_VARIABLE OUTPUT) + COMPILE_OUTPUT_VARIABLE OUTPUT) # if it did not compile make the return value fail code of 1 IF(NOT ${VAR}_COMPILED) SET(${VAR} 1) diff --git a/Modules/CheckCXXSourceRuns.cmake b/Modules/CheckCXXSourceRuns.cmake index 04ae7a9..f117977 100644 --- a/Modules/CheckCXXSourceRuns.cmake +++ b/Modules/CheckCXXSourceRuns.cmake @@ -2,7 +2,7 @@ # CHECK_CXX_SOURCE_RUNS(SOURCE VAR) # - macro which checks if the source code compiles # SOURCE - source code to try to compile -# VAR - variable to store size if the type exists. +# VAR - variable to store the result, 1 for success, empty for failure # # The following variables may be set before calling this macro to # modify the way the check is run: @@ -39,7 +39,8 @@ MACRO(CHECK_CXX_SOURCE_RUNS SOURCE VAR) CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} "${CHECK_CXX_SOURCE_COMPILES_ADD_LIBRARIES}" "${CHECK_CXX_SOURCE_COMPILES_ADD_INCLUDES}" - OUTPUT_VARIABLE OUTPUT) + COMPILE_OUTPUT_VARIABLE OUTPUT) + # if it did not compile make the return value fail code of 1 IF(NOT ${VAR}_COMPILED) SET(${VAR} 1) diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake index 74405d6..f09fd5c 100644 --- a/Modules/FindThreads.cmake +++ b/Modules/FindThreads.cmake @@ -56,7 +56,7 @@ ELSE(CMAKE_HAVE_SPROC_H) ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/CheckForPthreads.c CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread - OUTPUT_VARIABLE OUTPUT) + COMPILE_OUTPUT_VARIABLE OUTPUT) IF(THREADS_HAVE_PTHREAD_ARG) IF(THREADS_PTHREAD_ARG MATCHES "^2$") MESSAGE(STATUS "Check if compiler accepts -pthread - yes") diff --git a/Modules/TestBigEndian.cmake b/Modules/TestBigEndian.cmake index b1a65bf..2d1853c 100644 --- a/Modules/TestBigEndian.cmake +++ b/Modules/TestBigEndian.cmake @@ -11,7 +11,7 @@ MACRO(TEST_BIG_ENDIAN VARIABLE) TRY_RUN(${VARIABLE} HAVE_${VARIABLE} ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/TestBigEndian.c - OUTPUT_VARIABLE OUTPUT) + COMPILE_OUTPUT_VARIABLE OUTPUT) IF("${VARIABLE}" STREQUAL "FAILED_TO_RUN") MESSAGE(SEND_ERROR "TestBigEndian Failed to run with output: ${OUTPUT}") ENDIF("${VARIABLE}" STREQUAL "FAILED_TO_RUN") |