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

cmCustomCommand: Return std::string from GetWorkingDirectory

Browse Source
This commit is contained in:
Brad King
2014-03-10 13:53:57 -04:00
parent cb8f87f622
commit d45e7f3461
7 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@@ -1023,9 +1023,9 @@ cmLocalUnixMakefileGenerator3
}
// if the command specified a working directory use it.
const char* dir = this->Makefile->GetStartOutputDirectory();
const char* workingDir = cc.GetWorkingDirectory();
if(workingDir)
std::string dir = this->Makefile->GetStartOutputDirectory();
std::string workingDir = cc.GetWorkingDirectory();
if(!workingDir.empty())
{
dir = workingDir;
}
@@ -1066,7 +1066,7 @@ cmLocalUnixMakefileGenerator3
// Convert the command to a relative path only if the current
// working directory will be the start-output directory.
bool had_slash = cmd.find("/") != cmd.npos;
if(!workingDir)
if(workingDir.empty())
{
cmd = this->Convert(cmd,START_OUTPUT);
}
@@ -1079,7 +1079,8 @@ cmLocalUnixMakefileGenerator3
cmd = "./" + cmd;
}
std::string launcher =
this->MakeLauncher(cc, target, workingDir? NONE : START_OUTPUT);
this->MakeLauncher(cc, target,
workingDir.empty()? START_OUTPUT : NONE);
cmd = launcher + this->ConvertShellCommand(cmd, NONE);
ccg.AppendArguments(c, cmd);
@@ -1125,7 +1126,7 @@ cmLocalUnixMakefileGenerator3
}
// Setup the proper working directory for the commands.
this->CreateCDCommand(commands1, dir, relative);
this->CreateCDCommand(commands1, dir.c_str(), relative);
// push back the custom commands
commands.insert(commands.end(), commands1.begin(), commands1.end());