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:56 (GMT) |
| commit | 599e49cf9be62c1d41c9c5d23af7492eb0228c06 (patch) | |
| tree | 3bb17a59d7b19a963643bdf923dcfabb7cdea40e /Source | |
| parent | 787fc8caa8c46b7c29e05c9b367f8e85665845d4 (diff) | |
| parent | d0e52219eb1c8a614bbb416f73c932b7858292f8 (diff) | |
| download | CMake-599e49cf9be62c1d41c9c5d23af7492eb0228c06.zip CMake-599e49cf9be62c1d41c9c5d23af7492eb0228c06.tar.gz CMake-599e49cf9be62c1d41c9c5d23af7492eb0228c06.tar.bz2 | |
Merge topic 'revert_nvcc_marking_include_as_system' into release-3.25
d0e52219eb CUDA: Revert "Always mark cuda toolkit as system include"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7798
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 6962b52..c2bf888 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1855,15 +1855,6 @@ void cmGlobalGenerator::FinalizeTargetConfiguration() cmExpandedList(standardIncludesStr); standardIncludesSet.insert(standardIncludesVec.begin(), standardIncludesVec.end()); - if (li == "CUDA") { - std::string const& cudaSystemIncludeVar = - mf->GetSafeDefinition("CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES"); - std::vector<std::string> cudaToolkitIncludeVec = - cmExpandedList(cudaSystemIncludeVar); - standardIncludesSet.insert(cudaToolkitIncludeVec.begin(), - cudaToolkitIncludeVec.end()); - mf->AddIncludeDirectories(cudaToolkitIncludeVec); - } } mf->AddSystemIncludeDirectories(standardIncludesSet); } |