diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2017-04-25 13:44:53 (GMT) |
|---|---|---|
| committer | Robert Maynard <robert.maynard@kitware.com> | 2017-04-26 15:41:22 (GMT) |
| commit | 8fb85c68bb0090b44df22c27dabc03da63602e5e (patch) | |
| tree | 218cecb7d49796272113e44a269d72ad37d35e52 /Source | |
| parent | a36fb229ba04321be3d0a2472a944c05fea987e9 (diff) | |
| download | CMake-8fb85c68bb0090b44df22c27dabc03da63602e5e.zip CMake-8fb85c68bb0090b44df22c27dabc03da63602e5e.tar.gz CMake-8fb85c68bb0090b44df22c27dabc03da63602e5e.tar.bz2 | |
CUDA: Makefile uses relative path for device linking status messages
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index a93b42d..a719887 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/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); } diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index e017b29..b427495 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/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); } |