mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-27 03:08:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cuda_nvcc_abi_werror'

Browse Source 
079ea66468 CMakeDetermineCompilerABI: Handle NVCC-style -Werror flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Seth R Johnson <johnsonsr@ornl.gov>
Merge-request: !5318
This commit is contained in:
Brad King
2020-10-05 12:54:45 +00:00
committed by Kitware Robot
parent a0964cbe63 079ea66468
commit d25c38374c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Help/release/dev/cuda-nvcc-werror-abi.rst Normal file
View File

@@ -0,0 +1,4 @@
cuda-nvcc-werror-abi
--------------------
* Compiler ABI detection now handles NVCC-style ``-Werror`` flags.

2
Modules/CMakeDetermineCompilerABI.cmake
View File

@@ -33,7 +33,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