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

Merge topic 'cuda_device_linking_drop_dynamic_libs'

Browse Source 
e8cc8d22d8 Merge branch 'backport-cuda-filter-device-link-libs'
3f5bfb425a CUDA: Filter out non-static libraries during device linking
3c31ec7a0a CUDA: Filter out non-static libraries during device linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Merge-request: !2536
This commit is contained in:
Brad King
2018-10-30 15:02:49 +00:00
committed by Kitware Robot
parent 87dfd53b27 e8cc8d22d8
commit 1d4b1a5853
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLinkLineDeviceComputer.cxx
+8 -8
View File
@@ -77,15 +77,15 @@ std::string cmLinkLineDeviceComputer::ComputeLinkLibraries(
std::string out;
if (item.IsPath) {
// nvcc understands absolute paths to libraries ending in '.a' should
// be passed to nvlink. Other extensions like '.so' or '.dylib' are
// rejected by the nvcc front-end even though nvlink knows to ignore
// them. Bypass the front-end via '-Xnvlink'.
if (!cmHasLiteralSuffix(item.Value, ".a")) {
out += "-Xnvlink ";
// nvcc understands absolute paths to libraries ending in '.a' or '.lib'.
// These should be passed to nvlink. Other extensions need to be left
// out because nvlink may not understand or need them. Even though it
// can tolerate '.so' or '.dylib' it cannot tolerate '.so.1'.
if (cmHasLiteralSuffix(item.Value, ".a") ||
cmHasLiteralSuffix(item.Value, ".lib")) {
out += this->ConvertToOutputFormat(
this->ConvertToLinkReference(item.Value));
}
out +=
this->ConvertToOutputFormat(this->ConvertToLinkReference(item.Value));
} else if (cmLinkItemValidForDevice(item.Value)) {
out += item.Value;
}