summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-11-03 14:37:33 +0000
committerKitware Robot <kwrobot@kitware.com>2021-11-03 10:37:55 -0400
commit98f0ee645fc70a71353f87f86139d1db56f0541b (patch)
tree2302b4e4e862d9a8ea92d4edab26b9ac59aecab7
parent47846c50632f6d43d528c5e4fe537b8165d313a9 (diff)
parent92624714c4ab99fd14631c7a8b45d5efc02cdff9 (diff)
downloadcmake-98f0ee645fc70a71353f87f86139d1db56f0541b.tar.gz
Merge topic 'nvhpc-isystem'
92624714c4 NVHPC: Support SYSTEM include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6691
-rw-r--r--Modules/Compiler/NVHPC.cmake1
-rw-r--r--Tests/IncludeDirectories/CMakeLists.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/Modules/Compiler/NVHPC.cmake b/Modules/Compiler/NVHPC.cmake
index 70486705c1..b51bb43392 100644
--- a/Modules/Compiler/NVHPC.cmake
+++ b/Modules/Compiler/NVHPC.cmake
@@ -12,4 +12,5 @@ include(Compiler/PGI)
macro(__compiler_nvhpc lang)
# Logic specific to NVHPC.
+ set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
endmacro()
diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
index 5be1e97e2f..788c5bee82 100644
--- a/Tests/IncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -7,6 +7,7 @@ endif()
project(IncludeDirectories)
if (((CMAKE_C_COMPILER_ID STREQUAL GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.4)
OR (CMAKE_C_COMPILER_ID STREQUAL Clang AND NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
+ OR CMAKE_C_COMPILER_ID STREQUAL NVHPC
OR CMAKE_C_COMPILER_ID STREQUAL AppleClang
OR CMAKE_C_COMPILER_ID STREQUAL LCC
OR ("x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC" AND