diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-12-01 15:51:49 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2014-12-03 16:06:44 (GMT) |
| commit | ceecd7902fe80baabfad0235c54719e19a3df06b (patch) | |
| tree | 06dd7fdaa510c14d25e176f02d7aa1f6404d14f6 /Source/cmConditionEvaluator.cxx | |
| parent | 7878d06189e6ee11646fcad9851d5bc4d19a16e6 (diff) | |
| download | CMake-ceecd7902fe80baabfad0235c54719e19a3df06b.zip CMake-ceecd7902fe80baabfad0235c54719e19a3df06b.tar.gz CMake-ceecd7902fe80baabfad0235c54719e19a3df06b.tar.bz2 | |
cmMakefile: store the number of last matches in a CMake var
With PushScope and PopScope, keeping track of another bit of data for
each scope isn't easy. Instead, store it as another CMake variable so it
gets implicitly tracked along with everything else.
This works in a revert of commit
7d674b5f0b28a610333644d417c2e8cb796cc9e4.
Diffstat (limited to 'Source/cmConditionEvaluator.cxx')
| -rw-r--r-- | Source/cmConditionEvaluator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 6065b8a..aba26de 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -11,7 +11,6 @@ ============================================================================*/ #include "cmConditionEvaluator.h" -#include "cmStringCommand.h" cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile): Makefile(makefile), @@ -556,7 +555,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs, { def = this->GetVariableOrString(*arg); const char* rex = argP2->c_str(); - cmStringCommand::ClearMatches(&this->Makefile); + this->Makefile.ClearMatches(); cmsys::RegularExpression regEntry; if ( !regEntry.compile(rex) ) { @@ -568,7 +567,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs, } if (regEntry.find(def)) { - cmStringCommand::StoreMatches(&this->Makefile, regEntry); + this->Makefile.StoreMatches(regEntry); *arg = cmExpandedCommandArgument("1", true); } else |