Browse Source

CUDA: Makefile uses relative path for device linking status messages

pull/304/head
Robert Maynard 8 years ago
parent
commit
8fb85c68bb
  1. 6
      Source/cmMakefileExecutableTargetGenerator.cxx
  2. 8
      Source/cmMakefileLibraryTargetGenerator.cxx

6
Source/cmMakefileExecutableTargetGenerator.cxx

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

8
Source/cmMakefileLibraryTargetGenerator.cxx

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

Loading…
Cancel
Save