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

CUDA: Visual Studio propagate objects to device linking

Browse Source 
When given objects via `target_link_libraries(consumer PRIVATE producer)` the VisualStudio solution adds the objects
under as `<Object>` entries in the solution.

This works for host side linking but isn't handled by
the cuda msbuild extensions. So to work around this we
manually add the objects as additional link items.
This commit is contained in:
Robert Maynard
2023-09-22 11:13:25 -04:00
parent f83790af0b
commit aa8facefe8
1 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -3864,22 +3864,41 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaLinkOptions(
}
cudaLinkOptions.AppendFlagString("AdditionalOptions", linkFlags);
// For static libraries that have device linking enabled compute
// the libraries
if (this->GeneratorTarget->GetType() == cmStateEnums::STATIC_LIBRARY &&
doDeviceLinking) {
cmComputeLinkInformation& cli = *pcli;
cmLinkLineDeviceComputer computer(
this->LocalGenerator,
this->LocalGenerator->GetStateSnapshot().GetDirectory());
std::vector<BT<std::string>> btLibVec;
computer.ComputeLinkLibraries(cli, std::string{}, btLibVec);
if (doDeviceLinking) {
std::vector<std::string> libVec;
for (auto const& item : btLibVec) {
libVec.emplace_back(item.Value);
auto const& kinded = this->GeneratorTarget->GetKindedSources(configName);
// CMake conversion uses full paths when possible to allow deeper trees.
// However, CUDA 8.0 msbuild rules fail on absolute paths so for CUDA
// we must use relative paths.
const bool forceRelative = true;
for (cmGeneratorTarget::SourceAndKind const& si : kinded.Sources) {
switch (si.Kind) {
case cmGeneratorTarget::SourceKindExternalObject: {
std::string path =
this->ConvertPath(si.Source.Value->GetFullPath(), forceRelative);
ConvertToWindowsSlash(path);
libVec.emplace_back(std::move(path));
} break;
default:
break;
}
}
// For static libraries that have device linking enabled compute
// the libraries
if (this->GeneratorTarget->GetType() == cmStateEnums::STATIC_LIBRARY) {
cmComputeLinkInformation& cli = *pcli;
cmLinkLineDeviceComputer computer(
this->LocalGenerator,
this->LocalGenerator->GetStateSnapshot().GetDirectory());
std::vector<BT<std::string>> btLibVec;
computer.ComputeLinkLibraries(cli, std::string{}, btLibVec);
for (auto const& item : btLibVec) {
libVec.emplace_back(item.Value);
}
}
if (!libVec.empty()) {
cudaLinkOptions.AddFlag("AdditionalDependencies", libVec);
}
cudaLinkOptions.AddFlag("AdditionalDependencies", libVec);
}
this->CudaLinkOptions[configName] = std::move(pOptions);