mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05: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
Source/cmLocalVisualStudioGenerator.cxx
+4 -4
View File
@@ -84,9 +84,9 @@ cmLocalVisualStudioGenerator
const std::string& newline_text)
{
bool useLocal = this->CustomCommandUseLocal();
const char* workingDirectory = cc.GetWorkingDirectory();
std::string workingDirectory = cc.GetWorkingDirectory();
cmCustomCommandGenerator ccg(cc, configName, this->Makefile);
RelativeRoot relativeRoot = workingDirectory? NONE : START_OUTPUT;
RelativeRoot relativeRoot = workingDirectory.empty()? START_OUTPUT : NONE;
// Avoid leading or trailing newlines.
std::string newline = "";
@@ -114,7 +114,7 @@ cmLocalVisualStudioGenerator
script += "setlocal";
}
if(workingDirectory)
if(!workingDirectory.empty())
{
// Change the working directory.
script += newline;
@@ -124,7 +124,7 @@ cmLocalVisualStudioGenerator
script += check_error;
// Change the working drive.
if(workingDirectory[0] && workingDirectory[1] == ':')
if(workingDirectory.size() > 1 && workingDirectory[1] == ':')
{
script += newline;
newline = newline_text;