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/CheckCXXCompilerFlag.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/CheckCXXCompilerFlag.cmake')
| -rw-r--r-- | Modules/CheckCXXCompilerFlag.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake index 71b3fd2..fab3a05 100644 --- a/Modules/CheckCXXCompilerFlag.cmake +++ b/Modules/CheckCXXCompilerFlag.cmake @@ -12,7 +12,7 @@ # <var> - variable to store the result # # This internally calls the check_cxx_source_compiles macro and sets -# CMAKE_REQUIRED_FLAGS to <flag>. See help for +# CMAKE_REQUIRED_DEFINITIONS to <flag>. See help for # CheckCXXSourceCompiles 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 @@ -37,8 +37,8 @@ include(CheckCXXSourceCompiles) include(CMakeCheckCompilerFlagCommonPatterns) macro (CHECK_CXX_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(_CheckCXXCompilerFlag_LOCALE_VARS LC_ALL LC_MESSAGES LANG) @@ -59,6 +59,6 @@ macro (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT) unset(_CheckCXXCompilerFlag_LOCALE_VARS) unset(_CheckCXXCompilerFlag_COMMON_PATTERNS) - set (CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}") + set (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}") endmacro () |