diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-28 17:45:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-05-28 17:45:04 (GMT) |
| commit | 4c33b4e3b10109288d59d7cd17853f814754b024 (patch) | |
| tree | a379c917e1fe9e678ad2b2a6a183569d1c91c66d /Utilities/cmjsoncpp | |
| parent | 59d9fa713158610b6183b214841d0f272ee6f900 (diff) | |
| parent | dd6fd62615ef816f5cbdbd8cd5f827a5cc360464 (diff) | |
| download | CMake-4c33b4e3b10109288d59d7cd17853f814754b024.zip CMake-4c33b4e3b10109288d59d7cd17853f814754b024.tar.gz CMake-4c33b4e3b10109288d59d7cd17853f814754b024.tar.bz2 | |
Merge branch 'master' into ci-msvc-14.29-16.10
Diffstat (limited to 'Utilities/cmjsoncpp')
| -rw-r--r-- | Utilities/cmjsoncpp/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmjsoncpp/CMakeLists.txt b/Utilities/cmjsoncpp/CMakeLists.txt index 74e9988..029ae86 100644 --- a/Utilities/cmjsoncpp/CMakeLists.txt +++ b/Utilities/cmjsoncpp/CMakeLists.txt @@ -2,7 +2,7 @@ project(JsonCpp CXX) # Disable warnings to avoid changing 3rd party code. if(CMAKE_CXX_COMPILER_ID MATCHES - "^(GNU|Clang|AppleClang|XLClang|XL|VisualAge|SunPro|HP|Intel|IntelLLVM)$") + "^(GNU|Clang|AppleClang|XLClang|XL|VisualAge|SunPro|HP|Intel|IntelLLVM|NVHPC)$") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "PathScale") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -woffall") |