diff options
| author | Ken Martin <ken.martin@kitware.com> | 2002-06-28 01:17:25 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2002-06-28 01:17:25 (GMT) |
| commit | ca2fdeb640e88f11c3e36a8bf52b77e7081238c0 (patch) | |
| tree | 74ead45f8703f21a7cf126686aaccf521b7181c8 /Source | |
| parent | 6eb671097de75cb0f9f67876a42110ae6dc7d33b (diff) | |
| download | CMake-ca2fdeb640e88f11c3e36a8bf52b77e7081238c0.zip CMake-ca2fdeb640e88f11c3e36a8bf52b77e7081238c0.tar.gz CMake-ca2fdeb640e88f11c3e36a8bf52b77e7081238c0.tar.bz2 | |
performance inprovements
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 14 | ||||
| -rw-r--r-- | Source/cmSourceFile.h | 1 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 8506de9..4841584 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1209,6 +1209,12 @@ cmMakefile::FindSourceGroup(const char* source, bool cmMakefile::IsFunctionBlocked(const char *name, std::vector<std::string> const&args) { + // if there are no blockers get out of here + if (m_FunctionBlockers.begin() == m_FunctionBlockers.end()) + { + return false; + } + // loop over all function blockers to see if any block this command std::set<cmFunctionBlocker *>::const_iterator pos; std::vector<std::string> expandedArguments = args; @@ -1334,10 +1340,12 @@ cmSourceFile* cmMakefile::GetSource(const char* sourceName) const for(std::vector<cmSourceFile*>::const_iterator i = m_SourceFiles.begin(); i != m_SourceFiles.end(); ++i) { - if((*i)->GetSourceName() == s - && (ext.size() == 0 || (ext == (*i)->GetSourceExtension()))) + if ((*i)->GetSourceNameReference() == s) { - return *i; + if ((ext.size() == 0 || (ext == (*i)->GetSourceExtension()))) + { + return *i; + } } } return 0; diff --git a/Source/cmSourceFile.h b/Source/cmSourceFile.h index 0f975c0..3e41eaa 100644 --- a/Source/cmSourceFile.h +++ b/Source/cmSourceFile.h @@ -92,6 +92,7 @@ public: * (In most cases this is the name of the class.) */ std::string GetSourceName() const {return m_SourceName;} + const std::string &GetSourceNameReference() const {return m_SourceName;} void SetSourceName(const char *name) {m_SourceName = name;} /** |