summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalNinjaGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-08-27 16:52:40 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-09-19 19:36:14 (GMT)
commitad79061720b8f68cd8e406aadd240d233d2a1073 (patch)
tree8b8b52bb384d218c6c8e6410b78d1377ffa5d21f /Source/cmLocalNinjaGenerator.cxx
parent4cf707b08316be6afb15435ce57c67b467fc47b3 (diff)
downloadCMake-ad79061720b8f68cd8e406aadd240d233d2a1073.zip
CMake-ad79061720b8f68cd8e406aadd240d233d2a1073.tar.gz
CMake-ad79061720b8f68cd8e406aadd240d233d2a1073.tar.bz2
Convert: Inline uses of START_OUTPUT
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
-rw-r--r--Source/cmLocalNinjaGenerator.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index f2a13bc..82e4d2c 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -500,8 +500,10 @@ std::string cmLocalNinjaGenerator::MakeCustomLauncher(
const std::vector<std::string>& outputs = ccg.GetOutputs();
if (!outputs.empty()) {
if (ccg.GetWorkingDirectory().empty()) {
- output = this->Convert(outputs[0], cmOutputConverter::START_OUTPUT,
- cmOutputConverter::SHELL);
+ output = this->ConvertToOutputFormat(
+ this->ConvertToRelativePath(this->GetCurrentBinaryDirectory(),
+ outputs[0]),
+ cmOutputConverter::SHELL);
} else {
output =
this->ConvertToOutputFormat(outputs[0], cmOutputConverter::SHELL);