summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-06-18 13:36:54 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-06-18 13:37:09 (GMT)
commitbbe29710aed201f2623cf8dc46e8b9fd779d2a0a (patch)
tree6a33d4963d6a2c8955d2ba0c3d56c5a041fb87e3
parent5ef8c09a8ffe4dadd06aa25e1ed5d8f0112bf4c7 (diff)
parent701773f1da09568cc7501b97373fb1ad6b489a2b (diff)
downloadCMake-bbe29710aed201f2623cf8dc46e8b9fd779d2a0a.zip
CMake-bbe29710aed201f2623cf8dc46e8b9fd779d2a0a.tar.gz
CMake-bbe29710aed201f2623cf8dc46e8b9fd779d2a0a.tar.bz2
Merge topic 'gcc11-errors'
701773f1da CheckCompilerFlag: Handle -Werror= for GCC 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !6242
-rw-r--r--Modules/Internal/CheckCompilerFlag.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/Internal/CheckCompilerFlag.cmake b/Modules/Internal/CheckCompilerFlag.cmake
index 9eb1bf0..693e28b 100644
--- a/Modules/Internal/CheckCompilerFlag.cmake
+++ b/Modules/Internal/CheckCompilerFlag.cmake
@@ -13,10 +13,12 @@ function(CMAKE_CHECK_COMPILER_FLAG _lang _flag _var)
if(_lang STREQUAL "C")
set(_lang_src "int main(void) { return 0; }")
- set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for C")
+ set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for C"
+ FAIL_REGEX "-Werror=.* argument .* is not valid for C")
elseif(_lang STREQUAL "CXX")
set(_lang_src "int main() { return 0; }")
- set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for C\\+\\+")
+ set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for C\\+\\+"
+ FAIL_REGEX "-Werror=.* argument .* is not valid for C\\+\\+")
elseif(_lang STREQUAL "CUDA")
set(_lang_src "__host__ int main() { return 0; }")
set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for C\\+\\+" # Host GNU