summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-09-14 13:34:22 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-09-14 13:35:07 (GMT)
commit2a8d9bf4cc97edbf57142d96ace5c74473f76809 (patch)
tree04440edf0f060d71125856d7282f4a14cf9588e4 /Source
parent036f41e45f2d8e0017ae4bd1c3172d758deb83da (diff)
parent059b90a0b4760c3c0bb761870be2a0811f80ce70 (diff)
downloadCMake-2a8d9bf4cc97edbf57142d96ace5c74473f76809.zip
CMake-2a8d9bf4cc97edbf57142d96ace5c74473f76809.tar.gz
CMake-2a8d9bf4cc97edbf57142d96ace5c74473f76809.tar.bz2
Merge topic 'CMakeDependentOption-condition-syntax'
059b90a0b4 CMakeDependentOption: Introduce policy CMP0127 for full Condition Syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6493
Diffstat (limited to 'Source')
-rw-r--r--Source/cmPolicies.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index f7c0d25..a98e6c6 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -379,7 +379,10 @@ class cmMakefile;
3, 21, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0126, \
"set(CACHE) does not remove a normal variable of the same name.", 3, \
- 21, 0, cmPolicies::WARN)
+ 21, 0, cmPolicies::WARN) \
+ SELECT(POLICY, CMP0127, \
+ "cmake_dependent_option() supports full Condition Syntax.", 3, 22, \
+ 0, cmPolicies::WARN)
#define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1)
#define CM_FOR_EACH_POLICY_ID(POLICY) \