diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-08 13:55:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-08 13:55:16 (GMT) |
| commit | a639689c16039b2f7c8b63e31fbbbc753ccef8c8 (patch) | |
| tree | 28ec6915e54190cadbe5f28584b8ce466bfe4f42 /Modules/CheckCCompilerFlag.cmake | |
| parent | 5d5067ae57c9d02656a54076cdf121c7084a4de3 (diff) | |
| download | CMake-a639689c16039b2f7c8b63e31fbbbc753ccef8c8.zip CMake-a639689c16039b2f7c8b63e31fbbbc753ccef8c8.tar.gz CMake-a639689c16039b2f7c8b63e31fbbbc753ccef8c8.tar.bz2 | |
Check*CompilerFlag: Revert to previous method used to pass flags (#15641)
Since commit v3.3.0-rc1~397^2 (Check*CompilerFlag: Refactor method used
to pass flags, 2015-02-24) these check modules pass the flags to the
compiler front-end during linking as well as during compilation. This
breaks checks for flags like '-x c++' that are meant only for the
compilation step. Revert the change and add a test covering a
compiler-only flag.
Diffstat (limited to 'Modules/CheckCCompilerFlag.cmake')
| -rw-r--r-- | Modules/CheckCCompilerFlag.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake index 750e4fb..53f3454 100644 --- a/Modules/CheckCCompilerFlag.cmake +++ b/Modules/CheckCCompilerFlag.cmake @@ -13,7 +13,7 @@ # Will be created as an internal cache variable. # # This internally calls the check_c_source_compiles macro and sets -# CMAKE_REQUIRED_FLAGS to <flag>. See help for +# CMAKE_REQUIRED_DEFINITIONS to <flag>. See help for # CheckCSourceCompiles for a listing of variables that can otherwise # modify the build. The result only tells that the compiler does not # give an error message when it encounters the flag. If the flag has @@ -38,8 +38,8 @@ include(CheckCSourceCompiles) include(CMakeCheckCompilerFlagCommonPatterns) macro (CHECK_C_COMPILER_FLAG _FLAG _RESULT) - set(SAFE_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") - set(CMAKE_REQUIRED_FLAGS "${_FLAG}") + set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}") + set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}") # Normalize locale during test compilation. set(_CheckCCompilerFlag_LOCALE_VARS LC_ALL LC_MESSAGES LANG) @@ -60,5 +60,5 @@ macro (CHECK_C_COMPILER_FLAG _FLAG _RESULT) unset(_CheckCCompilerFlag_LOCALE_VARS) unset(_CheckCCompilerFlag_COMMON_PATTERNS) - set (CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}") + set (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}") endmacro () |