Ver código fonte

Makefiles: Separate two coupled calls

Stephen Kelly 9 anos atrás
pai
commit
4a3c49b469
1 arquivos alterados com 3 adições e 4 exclusões
  1. 3 4
      Source/cmLocalUnixMakefileGenerator3.cxx

+ 3 - 4
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);