summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-01-08 14:42:30 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-01-08 14:42:39 (GMT)
commit827a98657e49e854cfd57eecf7878ff73e15794b (patch)
tree41d76ca3dde5ddd0e15d1adc1554d0ae3babe273
parent4a4d639334cdada987fa08f1e5179ab3726ad9c7 (diff)
parent63e20653f8f31fe4b25e909b25adad85cacaf26b (diff)
downloadCMake-827a98657e49e854cfd57eecf7878ff73e15794b.zip
CMake-827a98657e49e854cfd57eecf7878ff73e15794b.tar.gz
CMake-827a98657e49e854cfd57eecf7878ff73e15794b.tar.bz2
Merge topic 'add_test-CROSSCOMPILING_EMULATOR-exclusive'
63e20653f8 add_test: Fix version of CMake introducing CMP0158 (to 3.29) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !9134
-rw-r--r--Help/policy/CMP0158.rst2
-rw-r--r--Source/cmPolicies.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/Help/policy/CMP0158.rst b/Help/policy/CMP0158.rst
index 4289c6d..369b5ec 100644
--- a/Help/policy/CMP0158.rst
+++ b/Help/policy/CMP0158.rst
@@ -25,3 +25,5 @@ This policy was introduced in CMake version 3.29. Use the
:command:`cmake_policy` command to set it to ``OLD`` or ``NEW`` explicitly.
Unlike many policies, CMake version |release| does *not* warn
when this policy is not set and simply uses ``OLD`` behavior.
+
+.. include:: DEPRECATED.txt
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index f038c6b..3f20dc0 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -484,7 +484,7 @@ class cmMakefile;
SELECT(POLICY, CMP0158, \
"add_test() honors CMAKE_CROSSCOMPILING_EMULATOR only when " \
"cross-compiling.", \
- 3, 28, 0, cmPolicies::WARN)
+ 3, 29, 0, cmPolicies::WARN)
#define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1)
#define CM_FOR_EACH_POLICY_ID(POLICY) \