diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-10 17:53:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-12 14:44:00 (GMT) |
| commit | d45e7f34611cd678bdda29d7d2b2ff4ce1abbce7 (patch) | |
| tree | 8ebbe10ac12a7d52520ee22b01c6a4391e2dd319 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | cb8f87f6229359790956a6640639bbe6b8c346f7 (diff) | |
| download | CMake-d45e7f34611cd678bdda29d7d2b2ff4ce1abbce7.zip CMake-d45e7f34611cd678bdda29d7d2b2ff4ce1abbce7.tar.gz CMake-d45e7f34611cd678bdda29d7d2b2ff4ce1abbce7.tar.bz2 | |
cmCustomCommand: Return std::string from GetWorkingDirectory
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 30a2a1e..16c74b9 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1646,10 +1646,11 @@ void cmGlobalXCodeGenerator cmSystemTools::ReplaceString(cmd2, "/./", "/"); cmd2 = this->ConvertToRelativeForMake(cmd2.c_str()); std::string cmd; - if(cc.GetWorkingDirectory()) + std::string wd = cc.GetWorkingDirectory(); + if(!wd.empty()) { cmd += "cd "; - cmd += this->ConvertToRelativeForMake(cc.GetWorkingDirectory()); + cmd += this->ConvertToRelativeForMake(wd.c_str()); cmd += " && "; } cmd += cmd2; |