diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-09 08:47:43 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-09 08:47:43 (GMT) |
| commit | 4a3c49b4698f0e8c20c345770f551142088a3037 (patch) | |
| tree | eae25582f5128ac9709c47b7a8ba6f7e20f578f0 /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | 8312fd5c1f82d5acc600c9d796ff99620cbbd3e1 (diff) | |
| download | CMake-4a3c49b4698f0e8c20c345770f551142088a3037.zip CMake-4a3c49b4698f0e8c20c345770f551142088a3037.tar.gz CMake-4a3c49b4698f0e8c20c345770f551142088a3037.tar.bz2 | |
Makefiles: Separate two coupled calls
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 7 |
1 files 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<std::string>& 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); |