mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 06:47:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'revert_nvcc_marking_include_as_system'

Browse Source 
d0e52219eb CUDA: Revert "Always mark cuda toolkit as system include"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7798
This commit is contained in:
Brad King
2022-10-18 17:45:47 +00:00
committed by Kitware Robot
parent 10b9a48246 d0e52219eb
commit b3cf2da514
6 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGlobalGenerator.cxx
-9
View File
@@ -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);
}