mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Makefiles: Separate two coupled calls

Browse Source
This commit is contained in:
Stephen Kelly
2016-10-09 10:47:43 +02:00
parent 8312fd5c1f
commit 4a3c49b469
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@@ -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);