kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VS: Replace variable with an if()

This commit is contained in:
Stephen Kelly 2016-08-27 13:44:54 +02:00
parent ee49f006cf
commit 998d9ee967
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmLocalVisualStudioGenerator.cxx
View File

@ -127,7 +127,6 @@ std::string cmLocalVisualStudioGenerator::ConstructScript(
{ {
bool useLocal = this->CustomCommandUseLocal(); bool useLocal = this->CustomCommandUseLocal();
std::string workingDirectory = ccg.GetWorkingDirectory(); std::string workingDirectory = ccg.GetWorkingDirectory();
RelativeRoot relativeRoot = workingDirectory.empty() ? START_OUTPUT : NONE;
// Avoid leading or trailing newlines. // Avoid leading or trailing newlines.
std::string newline = ""; std::string newline = "";
@ -203,7 +202,11 @@ std::string cmLocalVisualStudioGenerator::ConstructScript(
} }
} }
script += this->Convert(cmd.c_str(), relativeRoot, SHELL); if (workingDirectory.empty()) {
script += this->Convert(cmd.c_str(), START_OUTPUT, SHELL);
} else {
script += this->Convert(cmd.c_str(), NONE, SHELL);
}
ccg.AppendArguments(c, script); ccg.AppendArguments(c, script);
// After each custom command, check for an error result. // After each custom command, check for an error result.