|
|
@@ -995,14 +995,15 @@ void cmLocalUnixMakefileGenerator3::AppendCustomCommand(
|
|
|
std::string output;
|
|
|
const std::vector<std::string>& outputs = ccg.GetOutputs();
|
|
|
if (!outputs.empty()) {
|
|
|
+ output = outputs[0];
|
|
|
if (workingDir.empty()) {
|
|
|
output = this->MaybeConvertToRelativePath(
|
|
|
- this->GetCurrentBinaryDirectory(), outputs[0]);
|
|
|
- output = this->ConvertToOutputFormat(output,
|
|
|
- cmOutputConverter::SHELL);
|
|
|
+ this->GetCurrentBinaryDirectory(), output);
|
|
|
+ output =
|
|
|
+ this->ConvertToOutputFormat(output, cmOutputConverter::SHELL);
|
|
|
} else {
|
|
|
- output = this->ConvertToOutputFormat(outputs[0],
|
|
|
- cmOutputConverter::SHELL);
|
|
|
+ output =
|
|
|
+ this->ConvertToOutputFormat(output, cmOutputConverter::SHELL);
|
|
|
}
|
|
|
}
|
|
|
vars.Output = output.c_str();
|