diff options
| author | David Cole <david.cole@kitware.com> | 2011-08-16 21:03:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-08-16 21:03:05 (GMT) |
| commit | bdedae4b957faf713d77f9b439d28e7588f0adb9 (patch) | |
| tree | 4919a80bf10750622c80f859682b2f74ca5c4714 /Modules | |
| parent | 674be27a7f673d6af8de53ceb5d5ea407bd574ad (diff) | |
| parent | ed6be501de960a21fc756d08e9a0a2318f276307 (diff) | |
| download | CMake-bdedae4b957faf713d77f9b439d28e7588f0adb9.zip CMake-bdedae4b957faf713d77f9b439d28e7588f0adb9.tar.gz CMake-bdedae4b957faf713d77f9b439d28e7588f0adb9.tar.bz2 | |
Merge topic 'fix-clang-flag-check-issue-12394'
ed6be50 Fix CHECK_(C|CXX)_COMPILER_FLAG for Clang (#12394)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CheckCCompilerFlag.cmake | 1 | ||||
| -rw-r--r-- | Modules/CheckCXXCompilerFlag.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake index a390b38..ec0a773 100644 --- a/Modules/CheckCCompilerFlag.cmake +++ b/Modules/CheckCCompilerFlag.cmake @@ -30,6 +30,7 @@ MACRO (CHECK_C_COMPILER_FLAG _FLAG _RESULT) FAIL_REGEX "warning: command line option .* is valid for .* but not for C" # Apple gcc FAIL_REGEX "unrecognized .*option" # GNU + FAIL_REGEX "unknown .*option" # Clang FAIL_REGEX "ignoring unknown option" # MSVC FAIL_REGEX "warning D9002" # MSVC, any lang FAIL_REGEX "[Uu]nknown option" # HP diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake index 788bf35..f646e78 100644 --- a/Modules/CheckCXXCompilerFlag.cmake +++ b/Modules/CheckCXXCompilerFlag.cmake @@ -28,6 +28,7 @@ MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT) CHECK_CXX_SOURCE_COMPILES("int main() { return 0;}" ${_RESULT} # Some compilers do not fail with a bad flag FAIL_REGEX "unrecognized .*option" # GNU + FAIL_REGEX "unknown .*option" # Clang FAIL_REGEX "ignoring unknown option" # MSVC FAIL_REGEX "warning D9002" # MSVC, any lang FAIL_REGEX "[Uu]nknown option" # HP |