mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-09 23:44:00 +03:00
Code Activity

make cmGlobalXCodeGenerator::BuildObjectListOrString::Add() take a string&

Browse Source 
All callers already have these objects, and it is only passed to other methods
taking such, so avoid all conversions in between.
This commit is contained in:
Rolf Eike Beer committed 2016-04-20 23:34:57 +02:00
1 parent 6100bdff38
commit ffedf3527d
1 file changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGlobalXCodeGenerator.cxx
+5 -5
View File
@@ -84,7 +84,7 @@ public:
bool IsEmpty() const { return this->Empty; } bool IsEmpty() const { return this->Empty; }
void Add(const char *newString) void Add(const std::string& newString)
{ {
this->Empty = false; this->Empty = false;
@@ -2285,14 +2285,14 @@ 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()).c_str()); fdirs.Add(this->XCodeEscapePath(frameworkDir.c_str()));
} }
} }
else else
{ {
std::string incpath = std::string incpath =
this->XCodeEscapePath(i->c_str()); this->XCodeEscapePath(i->c_str());
dirs.Add(incpath.c_str()); dirs.Add(incpath);
} }
} }
// Add framework search paths needed for linking. // Add framework search paths needed for linking.
@@ -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()).c_str()); fdirs.Add(this->XCodeEscapePath(fdi->c_str()));
} }
} }
} }
@@ -4025,7 +4025,7 @@ cmGlobalXCodeGenerator::AppendDefines(BuildObjectListOrString& defs,
// Append the flag with needed escapes. // Append the flag with needed escapes.
std::string tmp; std::string tmp;
this->AppendFlag(tmp, def); this->AppendFlag(tmp, def);
defs.Add(tmp.c_str()); defs.Add(tmp);
} }
} }