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

make cmGlobalXCodeGenerator::XCodeEscapePath() take a std::string& 

All callers already have one, and it was immediately converted to one
internally. Just keep the old one around, and only modify it when needed.
This commit is contained in:
Rolf Eike Beer 2016-04-20 23:19:48 +02:00
parent ffedf3527d
commit 2b25ce30ca
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/cmGlobalXCodeGenerator.cxx
View File

@ -2285,13 +2285,13 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str()); frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
if(emitted.insert(frameworkDir).second) if(emitted.insert(frameworkDir).second)
{ {
fdirs.Add(this->XCodeEscapePath(frameworkDir.c_str())); fdirs.Add(this->XCodeEscapePath(frameworkDir));
} }
} }
else else
{ {
std::string incpath = std::string incpath =
this->XCodeEscapePath(i->c_str()); this->XCodeEscapePath(*i);
dirs.Add(incpath); dirs.Add(incpath);
} }
} }
@ -2304,7 +2304,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
{ {
if(emitted.insert(*fdi).second) if(emitted.insert(*fdi).second)
{ {
fdirs.Add(this->XCodeEscapePath(fdi->c_str())); fdirs.Add(this->XCodeEscapePath(*fdi));
} }
} }
} }
@ -2444,7 +2444,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
{ {
install_name_dir = ""; install_name_dir = "";
extraLinkOptions += " -install_name "; extraLinkOptions += " -install_name ";
extraLinkOptions += XCodeEscapePath(install_name.c_str()); extraLinkOptions += XCodeEscapePath(install_name);
} }
} }
buildSettings->AddAttribute("INSTALL_PATH", buildSettings->AddAttribute("INSTALL_PATH",
@ -2473,7 +2473,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
{ {
search_paths += " "; search_paths += " ";
} }
search_paths += this->XCodeEscapePath(runpath.c_str()); search_paths += this->XCodeEscapePath(runpath);
} }
} }
if(!search_paths.empty()) if(!search_paths.empty())
@ -3021,7 +3021,7 @@ void cmGlobalXCodeGenerator
{ {
linkObjs += sep; linkObjs += sep;
sep = " "; sep = " ";
linkObjs += this->XCodeEscapePath(oi->c_str()); linkObjs += this->XCodeEscapePath(*oi);
} }
this->AppendBuildSettingAttribute( this->AppendBuildSettingAttribute(
target, this->GetTargetLinkFlagsVar(gt), target, this->GetTargetLinkFlagsVar(gt),
@ -3068,10 +3068,10 @@ void cmGlobalXCodeGenerator
// $(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) to it: // $(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) to it:
linkDirs += " "; linkDirs += " ";
linkDirs += this->XCodeEscapePath( linkDirs += this->XCodeEscapePath(
(*libDir + "/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)").c_str()); *libDir + "/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)");
} }
linkDirs += " "; linkDirs += " ";
linkDirs += this->XCodeEscapePath(libDir->c_str()); linkDirs += this->XCodeEscapePath(*libDir);
} }
} }
this->AppendBuildSettingAttribute(target, "LIBRARY_SEARCH_PATHS", this->AppendBuildSettingAttribute(target, "LIBRARY_SEARCH_PATHS",
@ -3091,7 +3091,7 @@ void cmGlobalXCodeGenerator
sep = " "; sep = " ";
if(li->IsPath) if(li->IsPath)
{ {
linkLibs += this->XCodeEscapePath(li->Value.c_str()); linkLibs += this->XCodeEscapePath(li->Value);
} }
else if (!li->Target else if (!li->Target
|| li->Target->GetType() != cmState::INTERFACE_LIBRARY) || li->Target->GetType() != cmState::INTERFACE_LIBRARY)
@ -3932,17 +3932,16 @@ std::string cmGlobalXCodeGenerator::RelativeToBinary(const char* p)
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string cmGlobalXCodeGenerator::XCodeEscapePath(const char* p) std::string cmGlobalXCodeGenerator::XCodeEscapePath(const std::string& p)
{ {
std::string ret = p; if(p.find(' ') != p.npos)
if(ret.find(' ') != ret.npos)
{ {
std::string t = ret; std::string t = "\"";
ret = "\""; t += p;
ret += t; t += "\"";
ret += "\""; return t;
} }
return ret; return p;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

2
Source/cmGlobalXCodeGenerator.h
View File

@ -96,7 +96,7 @@ private:
bool CreateGroups(cmLocalGenerator* root, bool CreateGroups(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& std::vector<cmLocalGenerator*>&
generators); generators);
std::string XCodeEscapePath(const char* p); std::string XCodeEscapePath(const std::string& p);
std::string RelativeToSource(const char* p); std::string RelativeToSource(const char* p);
std::string RelativeToBinary(const char* p); std::string RelativeToBinary(const char* p);
std::string ConvertToRelativeForMake(const char* p); std::string ConvertToRelativeForMake(const char* p);