summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-05-07 19:59:47 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-05-07 19:59:47 (GMT)
commit1cc1efc063c332ec6e05837a33695adc4fd798e7 (patch)
tree5d32cdc665f54ef5a25c5bc19e6d356a0feffb58 /Source/cmMakefile.h
parent45f338e3d9fa73150348abc54f136cfdb001e654 (diff)
parent3f51752264bc1243fa2e56da41131ac363d3bd85 (diff)
downloadCMake-1cc1efc063c332ec6e05837a33695adc4fd798e7.zip
CMake-1cc1efc063c332ec6e05837a33695adc4fd798e7.tar.gz
CMake-1cc1efc063c332ec6e05837a33695adc4fd798e7.tar.bz2
Merge topic 'dev/regex-variables'
3f517522 StoreMatches: Minor cleanups ef62fbad ClearMatches: Store match variable names statically f718b30a ClearMatches: Only clear matches which were actually set
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 b4ee3b8..ac00771 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);
@@ -1070,6 +1073,8 @@ private:
cmSourceFile* source);
std::vector<cmSourceFile*> QtUiFilesWithOptions;
+
+ unsigned int NumLastMatches;
};
//----------------------------------------------------------------------------