diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-11-26 17:55:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-26 18:45:06 (GMT) |
| commit | 7d674b5f0b28a610333644d417c2e8cb796cc9e4 (patch) | |
| tree | 362847564a783ffb8fe9580fa98df3627a12372c /Source/cmMakefile.h | |
| parent | d2f2a2e226a8717d6fdb6df0ed4858d1629f557c (diff) | |
| download | CMake-7d674b5f0b28a610333644d417c2e8cb796cc9e4.zip CMake-7d674b5f0b28a610333644d417c2e8cb796cc9e4.tar.gz CMake-7d674b5f0b28a610333644d417c2e8cb796cc9e4.tar.bz2 | |
Revert "ClearMatches: Only clear matches which were actually set" (#15261)
This reverts commit v3.1.0-rc1~557^2~2 (ClearMatches: Only clear matches
which were actually set, 2014-03-12). The optimization did not track
the match count in the same scope as the variables, allowing possible
inconsistency.
Resolve conflicts in Source/cmIfCommand.cxx, Source/cmMakefile.cxx,
and Source/cmMakefile.h by moving the changes to the new location
of the code involved.
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 164290a..28f8686 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -942,9 +942,6 @@ public: std::string const& lhs, std::string const& rhs); - void ClearMatches(); - void StoreMatches(cmsys::RegularExpression& re); - protected: // add link libraries and directories to the target void AddGlobalLinkInformation(const std::string& name, cmTarget& target); @@ -1150,8 +1147,6 @@ private: std::vector<cmSourceFile*> QtUiFilesWithOptions; - unsigned int NumLastMatches; - bool AddRequiredTargetCFeature(cmTarget *target, const std::string& feature) const; |