summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.h
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2014-03-12 18:23:12 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2014-04-29 20:00:05 (GMT)
commitf718b30a95e07d72a361d55b7ba495eda5d79680 (patch)
tree5f06d51f999483a1e111fa2969d7a0d125356b55 /Source/cmMakefile.h
parentbb1c41a085c6eb9296bf701ea7633f715a06f6e1 (diff)
downloadCMake-f718b30a95e07d72a361d55b7ba495eda5d79680.zip
CMake-f718b30a95e07d72a361d55b7ba495eda5d79680.tar.gz
CMake-f718b30a95e07d72a361d55b7ba495eda5d79680.tar.bz2
ClearMatches: Only clear matches which were actually set
ClearMatches was clearing many variables which were never set in the first place. Instead, store how many matches were made last time and only clear those. It is moved to the cmMakefile class since it is a common utility used by multiple commands.
Diffstat (limited to 'Source/cmMakefile.h')
-rw-r--r--Source/cmMakefile.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 3bccb63..7d1759e 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -889,6 +889,9 @@ public:
const std::string& feature,
std::string *error = 0) const;
+ void ClearMatches();
+ void StoreMatches(cmsys::RegularExpression& re);
+
protected:
// add link libraries and directories to the target
void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
@@ -1065,6 +1068,8 @@ private:
cmSourceFile* source);
std::vector<cmSourceFile*> QtUiFilesWithOptions;
+
+ unsigned int NumLastMatches;
};
//----------------------------------------------------------------------------