diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-31 13:24:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-05-31 13:25:06 (GMT) |
| commit | 492bf5e0ac1b57a39bc6ed916abf556f5cf97edf (patch) | |
| tree | 82c53afc69426441453aa40bc4f8b68223523ccc | |
| parent | b50caaf96a33dd57ff6699cbb296131be0296ce9 (diff) | |
| parent | cec6f980181d9ca88ff53f0b1626713ed98a3369 (diff) | |
| download | CMake-492bf5e0ac1b57a39bc6ed916abf556f5cf97edf.zip CMake-492bf5e0ac1b57a39bc6ed916abf556f5cf97edf.tar.gz CMake-492bf5e0ac1b57a39bc6ed916abf556f5cf97edf.tar.bz2 | |
Merge topic 'werror_space_fix' into release-3.26
cec6f98018 CMakeDetermineCompilerABI: Avoid removing the flag after -Werror
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !8518
| -rw-r--r-- | Modules/CMakeDetermineCompilerABI.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake index 3fd54cc..df17796 100644 --- a/Modules/CMakeDetermineCompilerABI.cmake +++ b/Modules/CMakeDetermineCompilerABI.cmake @@ -42,7 +42,7 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src) __TestCompiler_setTryCompileTargetType() # Avoid failing ABI detection on warnings. - string(REGEX REPLACE "(^| )-Werror([= ][^ ]*)?( |$)" " " CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}") + string(REGEX REPLACE "(^| )-Werror([= ][^-][^ ]*)?( |$)" " " CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}") # Save the current LC_ALL, LC_MESSAGES, and LANG environment variables # and set them to "C" that way GCC's "search starts here" text is in |