diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-12-05 11:23:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-05 11:23:55 (GMT) |
| commit | 14576a40accb93f0f0a7f06b00996edf17ba4aa2 (patch) | |
| tree | 71932ca670f24cd1231266340ca5a1fd83117fe1 /Source | |
| parent | 2e8f8276c7693d2f7136569066e21995f0d00cc0 (diff) | |
| parent | da7ad7997e383eda8532d91269130524158a0a86 (diff) | |
| download | CMake-14576a40accb93f0f0a7f06b00996edf17ba4aa2.zip CMake-14576a40accb93f0f0a7f06b00996edf17ba4aa2.tar.gz CMake-14576a40accb93f0f0a7f06b00996edf17ba4aa2.tar.bz2 | |
Merge topic 'remove-WCDH-module'
da7ad7997e WriteCompilerDetectionHeader: Add policy to remove module
541f1410e0 Help: Move Documentation module to list of deprecated modules
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5573
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmIncludeCommand.cxx | 1 | ||||
| -rw-r--r-- | Source/cmPolicies.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx index 5e3aec5..ce1f030 100644 --- a/Source/cmIncludeCommand.cxx +++ b/Source/cmIncludeCommand.cxx @@ -21,6 +21,7 @@ bool cmIncludeCommand(std::vector<std::string> const& args, static std::map<std::string, cmPolicies::PolicyID> DeprecatedModules; if (DeprecatedModules.empty()) { DeprecatedModules["Documentation"] = cmPolicies::CMP0106; + DeprecatedModules["WriteCompilerDetectionHeader"] = cmPolicies::CMP0120; } if (args.empty() || args.size() > 4) { diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index 0d04f7a..2194b0f 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -356,7 +356,10 @@ class cmMakefile; SELECT(POLICY, CMP0119, \ "LANGUAGE source file property explicitly compiles as specified " \ "language.", \ - 3, 20, 0, cmPolicies::WARN) + 3, 20, 0, cmPolicies::WARN) \ + SELECT(POLICY, CMP0120, \ + "The WriteCompilerDetectionHeader module is removed.", 3, 20, 0, \ + cmPolicies::WARN) #define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1) #define CM_FOR_EACH_POLICY_ID(POLICY) \ |