summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-09-22 13:19:44 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-09-22 13:19:52 (GMT)
commit122ec98dcfa273d17c2ae7ccacbaf3a47d14152c (patch)
tree653a0a27d732a38b49657ff36fb44a81303e9c2c /Source/cmLocalGenerator.cxx
parentd2655c59dc914ec24f2bca142a748612caeb9e3d (diff)
parent6546aa2a2a2f695237a2f14745d18fc8a52b1fcf (diff)
downloadCMake-122ec98dcfa273d17c2ae7ccacbaf3a47d14152c.zip
CMake-122ec98dcfa273d17c2ae7ccacbaf3a47d14152c.tar.gz
CMake-122ec98dcfa273d17c2ae7ccacbaf3a47d14152c.tar.bz2
Merge topic 'hip-nvidia'
6546aa2a2a ci: Add HIP job using CUDA on NVIDIA GPUs 18158bf81c HIP: Add support for NVIDIA GPUs 127b6fa06b HIP: Add CMAKE_HIP_PLATFORM variable to specify GPU platform 90e23f40ee Tests/HIP/WithDefs: Clean up test case 9ebdf3281f Tests/HIP/ArchitectureOff: Cover HIP_ARCHITECTURES initialization cfec29196e ci: Add CUDA 11.8 to HIP 5.5 image 26470eb987 ci: Put HIP GPU platform in CMake_TEST_HIP Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8817
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index f1fe7df..fe8d502 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -87,6 +87,8 @@ static auto ruleReplaceVars = { "CMAKE_${LANG}_COMPILER",
"CMAKE_TAPI",
"CMAKE_CUDA_HOST_COMPILER",
"CMAKE_CUDA_HOST_LINK_LAUNCHER",
+ "CMAKE_HIP_HOST_COMPILER",
+ "CMAKE_HIP_HOST_LINK_LAUNCHER",
"CMAKE_CL_SHOWINCLUDES_PREFIX" };
cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg, cmMakefile* makefile)
@@ -2055,7 +2057,7 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags,
this->Makefile->GetSafeDefinition("CMAKE_CXX_SIMULATE_ID");
}
} else if (lang == "HIP") {
- target->AddHIPArchitectureFlags(flags);
+ target->AddHIPArchitectureFlags(compileOrLink, config, flags);
}
// Add VFS Overlay for Clang compilers