diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2007-03-15 21:22:33 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2007-03-15 21:22:33 (GMT) |
| commit | 9408e16704f204ae6ffe4036f3d0261b3a901ebe (patch) | |
| tree | 551083b512606ce6b1d6e3aca59c3d10a74ec12e /Utilities/cmcurl | |
| parent | 9314bb49e09b323f1c889d95448ca5dd0a42cc61 (diff) | |
| download | CMake-9408e16704f204ae6ffe4036f3d0261b3a901ebe.zip CMake-9408e16704f204ae6ffe4036f3d0261b3a901ebe.tar.gz CMake-9408e16704f204ae6ffe4036f3d0261b3a901ebe.tar.bz2 | |
ENH: Unify with the compile one
Diffstat (limited to 'Utilities/cmcurl')
| -rw-r--r-- | Utilities/cmcurl/CMake/CheckCSourceRuns.cmake | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/Utilities/cmcurl/CMake/CheckCSourceRuns.cmake b/Utilities/cmcurl/CMake/CheckCSourceRuns.cmake index 35d2cef..3462d9b 100644 --- a/Utilities/cmcurl/CMake/CheckCSourceRuns.cmake +++ b/Utilities/cmcurl/CMake/CheckCSourceRuns.cmake @@ -14,7 +14,13 @@ MACRO(CHECK_C_SOURCE_RUNS SOURCE VAR) IF("${VAR}" MATCHES "^${VAR}$" OR "${VAR}" MATCHES "UNKNOWN") - SET(MACRO_CHECK_FUNCTION_DEFINITIONS + SET(message "${VAR}") + # If the number of arguments is greater than 2 (SOURCE VAR) + IF(${ARGC} GREATER 2) + # then add the third argument as a message + SET(message "${ARGV2} (${VAR})") + ENDIF(${ARGC} GREATER 2) + SET(MACRO_CHECK_FUNCTION_DEFINITIONS "-D${VAR} ${CMAKE_REQUIRED_FLAGS}") IF(CMAKE_REQUIRED_LIBRARIES) SET(CHECK_C_SOURCE_COMPILES_ADD_LIBRARIES @@ -37,12 +43,11 @@ MACRO(CHECK_C_SOURCE_RUNS SOURCE VAR) ENDFOREACH(inc) SET(src "${src}\nint main() { ${SOURCE} ; return 0; }") - FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src2.c" - "${src}\n") - EXEC_PROGRAM("${CMAKE_COMMAND}" - "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp" - ARGS -E copy src2.c src.c) - MESSAGE(STATUS "Performing Test ${VAR}") + SET(CMAKE_CONFIGURABLE_FILE_CONTENT "${src}") + CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c" + IMMEDIATE) + MESSAGE(STATUS "Performing Test ${message}") TRY_RUN(${VAR} ${VAR}_COMPILED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c @@ -58,18 +63,18 @@ MACRO(CHECK_C_SOURCE_RUNS SOURCE VAR) # if the return value was 0 then it worked SET(result_var ${${VAR}}) IF("${result_var}" EQUAL 0) - SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}") - MESSAGE(STATUS "Performing Test ${VAR} - Success") + SET(${VAR} 1 CACHE INTERNAL "Test ${message}") + MESSAGE(STATUS "Performing Test ${message} - Success") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Performing C SOURCE FILE Test ${VAR} succeded with the following output:\n" + "Performing C SOURCE FILE Test ${message} succeded with the following output:\n" "${OUTPUT}\n" "Return value: ${${VAR}}\n" "Source file was:\n${src}\n") ELSE("${result_var}" EQUAL 0) - MESSAGE(STATUS "Performing Test ${VAR} - Failed") - SET(${VAR} "" CACHE INTERNAL "Test ${VAR}") + MESSAGE(STATUS "Performing Test ${message} - Failed") + SET(${VAR} "" CACHE INTERNAL "Test ${message}") FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Performing C SOURCE FILE Test ${VAR} failed with the following output:\n" + "Performing C SOURCE FILE Test ${message} failed with the following output:\n" "${OUTPUT}\n" "Return value: ${result_var}\n" "Source file was:\n${src}\n") |