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.

This commit is contained in:

Ben Boeckel

2014-11-26 12:55:44 -05:00

committed by

Brad King

parent d2f2a2e226

commit 7d674b5f0b

5 changed files with 43 additions and 60 deletions