summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.cxx
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2016-04-20 21:23:26 (GMT)
committerRolf Eike Beer <eike@sf-mail.de>2016-04-20 21:35:01 (GMT)
commit2263949b7817fad0b2560cb5dd8e102d1f547b47 (patch)
tree4fdd3b0038e860f0cc55cb736dc8b0f864af32c0 /Source/cmGlobalXCodeGenerator.cxx
parent2b25ce30ca825765a5c249e455c466802af95116 (diff)
downloadCMake-2263949b7817fad0b2560cb5dd8e102d1f547b47.zip
CMake-2263949b7817fad0b2560cb5dd8e102d1f547b47.tar.gz
CMake-2263949b7817fad0b2560cb5dd8e102d1f547b47.tar.bz2
cmGlobalXCodeGenerator: do not pass char* to cmSystemTools::CollapseFullPath()
This takes a std::string&, so directly pass the object to it instead of converting back and forth.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 8eb5e11..755c8a6 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2282,7 +2282,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
{
std::string frameworkDir = *i;
frameworkDir += "/../";
- frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
+ frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir);
if(emitted.insert(frameworkDir).second)
{
fdirs.Add(this->XCodeEscapePath(frameworkDir));