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

cmSourceFileLocation: Save some string copies

Browse Source
This commit is contained in:
Ben Boeckel 2014-03-11 01:49:11 -04:00 committed by Ben Boeckel
parent e8e1f3a19f
commit b4cb543e0c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmSourceFileLocation.cxx
View File

@ -192,7 +192,7 @@ cmSourceFileLocation
// Only a fixed set of extensions will be tried to match a file on // Only a fixed set of extensions will be tried to match a file on
// disk. One of these must match if loc refers to this source file. // disk. One of these must match if loc refers to this source file.
std::string ext = this->Name.substr(loc.Name.size()+1); std::string const& ext = this->Name.substr(loc.Name.size()+1);
cmMakefile const* mf = this->Makefile; cmMakefile const* mf = this->Makefile;
const std::vector<std::string>& srcExts = mf->GetSourceExtensions(); const std::vector<std::string>& srcExts = mf->GetSourceExtensions();
if(std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end()) if(std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end())
@ -216,7 +216,7 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc)
// Both extensions are similarly ambiguous. Since only the old fixed set // Both extensions are similarly ambiguous. Since only the old fixed set
// of extensions will be tried, the names must match at this point to be // of extensions will be tried, the names must match at this point to be
// the same file. // the same file.
if(this->Name != loc.Name) if(this->Name.size() != loc.Name.size() || this->Name != loc.Name)
{ {
return false; return false;
} }
@ -278,10 +278,10 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc)
else if(this->AmbiguousDirectory) else if(this->AmbiguousDirectory)
{ {
// Compare possible directory combinations. // Compare possible directory combinations.
std::string srcDir = std::string const& srcDir =
cmSystemTools::CollapseFullPath( cmSystemTools::CollapseFullPath(
this->Directory.c_str(), this->Makefile->GetCurrentDirectory()); this->Directory.c_str(), this->Makefile->GetCurrentDirectory());
std::string binDir = std::string const& binDir =
cmSystemTools::CollapseFullPath( cmSystemTools::CollapseFullPath(
this->Directory.c_str(), this->Makefile->GetCurrentOutputDirectory()); this->Directory.c_str(), this->Makefile->GetCurrentOutputDirectory());
if(srcDir != loc.Directory && if(srcDir != loc.Directory &&
@ -293,10 +293,10 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc)
else if(loc.AmbiguousDirectory) else if(loc.AmbiguousDirectory)
{ {
// Compare possible directory combinations. // Compare possible directory combinations.
std::string srcDir = std::string const& srcDir =
cmSystemTools::CollapseFullPath( cmSystemTools::CollapseFullPath(
loc.Directory.c_str(), loc.Makefile->GetCurrentDirectory()); loc.Directory.c_str(), loc.Makefile->GetCurrentDirectory());
std::string binDir = std::string const& binDir =
cmSystemTools::CollapseFullPath( cmSystemTools::CollapseFullPath(
loc.Directory.c_str(), loc.Makefile->GetCurrentOutputDirectory()); loc.Directory.c_str(), loc.Makefile->GetCurrentOutputDirectory());
if(srcDir != this->Directory && if(srcDir != this->Directory &&