diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-14 16:28:07 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-11-14 16:28:07 (GMT) |
| commit | 42eaf3416890ca6fc4462c112492bb740e943525 (patch) | |
| tree | a1c0105a76065349c1397de9a262651aceb06d0d /Utilities | |
| parent | 0b2d376142a46efe6cc68814c4f72eb8a618e590 (diff) | |
| parent | 15610bb5b16a4f39202a84a6f6ef1a22b17170df (diff) | |
| download | CMake-42eaf3416890ca6fc4462c112492bb740e943525.zip CMake-42eaf3416890ca6fc4462c112492bb740e943525.tar.gz CMake-42eaf3416890ca6fc4462c112492bb740e943525.tar.bz2 | |
Merge topic 'configure_file-drop-IMMEDIATE'
15610bb Drop use of configure_file IMMEDIATE option
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmcurl/CMake/CurlCheckCSourceCompiles.cmake | 3 | ||||
| -rw-r--r-- | Utilities/cmcurl/CMake/CurlCheckCSourceRuns.cmake | 3 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/build/cmake/CheckFuncs.cmake | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/Utilities/cmcurl/CMake/CurlCheckCSourceCompiles.cmake b/Utilities/cmcurl/CMake/CurlCheckCSourceCompiles.cmake index d025769..cfcf47b 100644 --- a/Utilities/cmcurl/CMake/CurlCheckCSourceCompiles.cmake +++ b/Utilities/cmcurl/CMake/CurlCheckCSourceCompiles.cmake @@ -45,8 +45,7 @@ MACRO(CURL_CHECK_C_SOURCE_COMPILES SOURCE VAR) SET(src "${src}\nint main() { ${SOURCE} ; return 0; }") SET(CMAKE_CONFIGURABLE_FILE_CONTENT "${src}") CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CMake/CMakeConfigurableFile.in - "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c" - IMMEDIATE) + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c") MESSAGE(STATUS "Performing Test ${message}") TRY_COMPILE(${VAR} ${CMAKE_BINARY_DIR} diff --git a/Utilities/cmcurl/CMake/CurlCheckCSourceRuns.cmake b/Utilities/cmcurl/CMake/CurlCheckCSourceRuns.cmake index 19681bd..1bd837a 100644 --- a/Utilities/cmcurl/CMake/CurlCheckCSourceRuns.cmake +++ b/Utilities/cmcurl/CMake/CurlCheckCSourceRuns.cmake @@ -45,8 +45,7 @@ MACRO(CURL_CHECK_C_SOURCE_RUNS SOURCE VAR) SET(src "${src}\nint main() { ${SOURCE} ; return 0; }") SET(CMAKE_CONFIGURABLE_FILE_CONTENT "${src}") CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/CMake/CMakeConfigurableFile.in - "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c" - IMMEDIATE) + "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.c") MESSAGE(STATUS "Performing Test ${message}") TRY_RUN(${VAR} ${VAR}_COMPILED ${CMAKE_BINARY_DIR} diff --git a/Utilities/cmlibarchive/build/cmake/CheckFuncs.cmake b/Utilities/cmlibarchive/build/cmake/CheckFuncs.cmake index 0670df9..84cc881 100644 --- a/Utilities/cmlibarchive/build/cmake/CheckFuncs.cmake +++ b/Utilities/cmlibarchive/build/cmake/CheckFuncs.cmake @@ -31,7 +31,7 @@ MACRO (CHECK_FUNCTION_EXISTS_GLIBC _FUNC _FUNCVAR) SET(CHECK_STUB_FUNC_1 "__stub_${_FUNC}") SET(CHECK_STUB_FUNC_2 "__stub___${_FUNC}") CONFIGURE_FILE( ${_selfdir_CheckFunctionExistsGlibc}/CheckFuncs_stub.c.in - ${CMAKE_CURRENT_BINARY_DIR}/cmake.tmp/CheckFuncs_stub.c IMMEDIATE) + ${CMAKE_CURRENT_BINARY_DIR}/cmake.tmp/CheckFuncs_stub.c) TRY_COMPILE(__stub ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/cmake.tmp/CheckFuncs_stub.c |