summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-07-06 00:02:02 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-07-25 12:48:36 (GMT)
commit658bfc5c525bd21ecd68847cd19bda7102245c35 (patch)
treeecd2e6e91f0d7ec17326f12b0c055e31014c1014
parentf4a25874a2cb5468e7ecce6812e5833e10943017 (diff)
downloadCMake-658bfc5c525bd21ecd68847cd19bda7102245c35.zip
CMake-658bfc5c525bd21ecd68847cd19bda7102245c35.tar.gz
CMake-658bfc5c525bd21ecd68847cd19bda7102245c35.tar.bz2
cmMakefile: Remove redundant condition from policy status computation.
-rw-r--r--Source/cmMakefile.cxx5
1 files changed, 0 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7a35a26..ab8499f 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4763,11 +4763,6 @@ cmMakefile::GetPolicyStatus(cmPolicies::PolicyID id) const
// current setting and tell the caller.
if(status != cmPolicies::NEW)
{
- if(status == cmPolicies::REQUIRED_ALWAYS ||
- status == cmPolicies::REQUIRED_IF_USED)
- {
- return status;
- }
cmPolicies::PolicyStatus def = cmPolicies::GetPolicyStatus(id);
if(def == cmPolicies::REQUIRED_ALWAYS ||
def == cmPolicies::REQUIRED_IF_USED)