From 4a3c49b4698f0e8c20c345770f551142088a3037 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 9 Oct 2016 10:47:43 +0200 Subject: Makefiles: Separate two coupled calls --- Source/cmLocalUnixMakefileGenerator3.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index eb2852c..5b4ecc7 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -996,11 +996,10 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand( const std::vector& outputs = ccg.GetOutputs(); if (!outputs.empty()) { if (workingDir.empty()) { - output = this->ConvertToOutputFormat( - this->MaybeConvertToRelativePath( - this->GetCurrentBinaryDirectory(), outputs[0]), + output = this->MaybeConvertToRelativePath( + this->GetCurrentBinaryDirectory(), outputs[0]); + output = this->ConvertToOutputFormat(output, cmOutputConverter::SHELL); - } else { output = this->ConvertToOutputFormat(outputs[0], cmOutputConverter::SHELL); -- cgit v0.12