diff options
| author | Brad King <brad.king@kitware.com> | 2022-07-05 14:32:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-07-05 14:32:54 (GMT) |
| commit | c70ed631f7fc26074fb944e01cafe9ef28903d56 (patch) | |
| tree | df5360456092e52376065328d959c4cf12b37bbe | |
| parent | 6fee995256fc4b8aae5484eb450499818d65470c (diff) | |
| parent | 35ec676ace82806a316adb36608e8812f2c27bfd (diff) | |
| download | CMake-c70ed631f7fc26074fb944e01cafe9ef28903d56.zip CMake-c70ed631f7fc26074fb944e01cafe9ef28903d56.tar.gz CMake-c70ed631f7fc26074fb944e01cafe9ef28903d56.tar.bz2 | |
Merge topic 'nvhpc-Werror' into release-3.24
35ec676ace NVHPC: warnings as error flag is "-Werror"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7415
| -rw-r--r-- | Modules/Compiler/NVHPC.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CompileWarningAsError/WarningAsErrorOptions.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/NVHPC.cmake b/Modules/Compiler/NVHPC.cmake index 21d0665..957dacd 100644 --- a/Modules/Compiler/NVHPC.cmake +++ b/Modules/Compiler/NVHPC.cmake @@ -13,5 +13,5 @@ include(Compiler/PGI) macro(__compiler_nvhpc lang) # Logic specific to NVHPC. set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ") - set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "--Werror all-warnings") + set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror all-warnings") endmacro() diff --git a/Tests/RunCMake/CompileWarningAsError/WarningAsErrorOptions.cmake b/Tests/RunCMake/CompileWarningAsError/WarningAsErrorOptions.cmake index 590c8a4..d8770e1 100644 --- a/Tests/RunCMake/CompileWarningAsError/WarningAsErrorOptions.cmake +++ b/Tests/RunCMake/CompileWarningAsError/WarningAsErrorOptions.cmake @@ -1,7 +1,7 @@ # add compile options to warning_options to ensure unused-function throws a warning # if warning_options is NOT DEFINED, assume compiler doesn't support warning as error macro(get_warning_options warning_options lang) - if (CMAKE_${lang}_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang|XLClang|IBMClang|LCC|IntelLLVM)$") + if (CMAKE_${lang}_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang|XLClang|IBMClang|LCC|IntelLLVM|NVHPC)$") set(${warning_options} "-Wall") elseif (CMAKE_${lang}_COMPILER_ID STREQUAL "MSVC" OR (CMAKE_${lang}_COMPILER_ID STREQUAL "Intel" AND CMAKE_${lang}_SIMULATE_ID MATCHES "MSVC")) |