mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

CUDA: Makefile uses relative path for device linking status messages

Browse Source
This commit is contained in:
Robert Maynard
2017-04-25 09:44:53 -04:00
parent a36fb229ba
commit 8fb85c68bb
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefileExecutableTargetGenerator.cxx
View File

@@ -122,7 +122,11 @@ void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule(
std::string buildEcho = "Linking "; std::string buildEcho = "Linking ";
buildEcho += linkLanguage; buildEcho += linkLanguage;
buildEcho += " device code "; buildEcho += " device code ";
buildEcho += targetOutputReal; buildEcho += this->LocalGenerator->ConvertToOutputFormat(
this->LocalGenerator->MaybeConvertToRelativePath(
this->LocalGenerator->GetCurrentBinaryDirectory(),
this->DeviceLinkObject),
cmOutputConverter::SHELL);
this->LocalGenerator->AppendEcho( this->LocalGenerator->AppendEcho(
commands, buildEcho, cmLocalUnixMakefileGenerator3::EchoLink, &progress); commands, buildEcho, cmLocalUnixMakefileGenerator3::EchoLink, &progress);
} }

8
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@@ -292,8 +292,12 @@ void cmMakefileLibraryTargetGenerator::WriteDeviceLibraryRules(
cmLocalUnixMakefileGenerator3::EchoProgress progress; cmLocalUnixMakefileGenerator3::EchoProgress progress;
this->MakeEchoProgress(progress); this->MakeEchoProgress(progress);
// Add the link message. // Add the link message.
std::string buildEcho = "Linking " + linkLanguage + " device code"; std::string buildEcho = "Linking " + linkLanguage + " device code ";
buildEcho += targetOutputReal; buildEcho += this->LocalGenerator->ConvertToOutputFormat(
this->LocalGenerator->MaybeConvertToRelativePath(
this->LocalGenerator->GetCurrentBinaryDirectory(),
this->DeviceLinkObject),
cmOutputConverter::SHELL);
this->LocalGenerator->AppendEcho( this->LocalGenerator->AppendEcho(
commands, buildEcho, cmLocalUnixMakefileGenerator3::EchoLink, &progress); commands, buildEcho, cmLocalUnixMakefileGenerator3::EchoLink, &progress);
} }