diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-18 17:45:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-18 17:45:57 (GMT) |
| commit | b3cf2da514383c421f82a2fbb413a0497221e377 (patch) | |
| tree | 8754ca7d5543554d564d8f4e8d9ba070503b2a4e /Modules | |
| parent | 10b9a482464a7ad4e2a2af06ce298c81a20e2099 (diff) | |
| parent | d0e52219eb1c8a614bbb416f73c932b7858292f8 (diff) | |
| download | CMake-b3cf2da514383c421f82a2fbb413a0497221e377.zip CMake-b3cf2da514383c421f82a2fbb413a0497221e377.tar.gz CMake-b3cf2da514383c421f82a2fbb413a0497221e377.tar.bz2 | |
Merge topic 'revert_nvcc_marking_include_as_system'
d0e52219eb CUDA: Revert "Always mark cuda toolkit as system include"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7798
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeTestCUDACompiler.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/CMakeTestCUDACompiler.cmake b/Modules/CMakeTestCUDACompiler.cmake index a89182b..f2fa6ea 100644 --- a/Modules/CMakeTestCUDACompiler.cmake +++ b/Modules/CMakeTestCUDACompiler.cmake @@ -127,8 +127,10 @@ list(REMOVE_ITEM CMAKE_CUDA_IMPLICIT_LINK_LIBRARIES ${CMAKE_CUDA_IMPLICIT_LINK_L if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA") # Remove the CUDA Toolkit include directories from the set of # implicit system include directories. - # CMake will explicitly mark these as SYSTEM to NVCC since it implicitly - # adds them as user includes and not system + # This resolves the issue that NVCC doesn't specify these + # includes as SYSTEM includes when compiling device code, and sometimes + # they contain headers that generate warnings, so let users mark them + # as SYSTEM explicitly if(CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES) list(REMOVE_ITEM CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES} |