diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-12 13:12:56 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-12 13:12:56 (GMT) |
| commit | 53bb51fc31ddfbc7c62598db1abdef3a1cdd45e7 (patch) | |
| tree | c0050bfc45d0254104555d004786dbedfa012751 /Source/cmMakefile.cxx | |
| parent | 70d48e1287c8e91c4815573485c8acba0879df89 (diff) | |
| parent | 226df303f955a8756cda7544f58242b52ea7ec2e (diff) | |
| download | CMake-53bb51fc31ddfbc7c62598db1abdef3a1cdd45e7.zip CMake-53bb51fc31ddfbc7c62598db1abdef3a1cdd45e7.tar.gz CMake-53bb51fc31ddfbc7c62598db1abdef3a1cdd45e7.tar.bz2 | |
Merge topic 'ctest-no-make-i'
226df303 CTest: Stop telling 'make' to ignore errors with -i
28e7a135 Help: Fix build_command alternative signature docs
231601b6 build_command: Choose configuration consistently across signatures
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 82add86..4ded936 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4942,6 +4942,26 @@ void cmMakefile::RecordPolicies(cmPolicies::PolicyMap& pm) } } +//---------------------------------------------------------------------------- +bool cmMakefile::IgnoreErrorsCMP0061() const +{ + bool ignoreErrors = true; + switch (this->GetPolicyStatus(cmPolicies::CMP0061)) + { + case cmPolicies::WARN: + // No warning for this policy! + case cmPolicies::OLD: + break; + case cmPolicies::REQUIRED_IF_USED: + case cmPolicies::REQUIRED_ALWAYS: + case cmPolicies::NEW: + ignoreErrors = false; + break; + } + return ignoreErrors; +} + +//---------------------------------------------------------------------------- #define FEATURE_STRING(F) , #F static const char * const C_FEATURES[] = { 0 |