Sfoglia il codice sorgente

Tests/PolicyScope: Use more recent policies

Brad King 1 anno fa
parent
commit
0d416ad57f

+ 3 - 3
Tests/PolicyScope/Bar.cmake

@@ -1,8 +1,8 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.31)
 
 # Make sure a policy set differently by our includer is now correct.
-cmake_policy(GET CMP0003 cmp)
-check(CMP0003 "NEW" "${cmp}")
+cmake_policy(GET CMP0180 cmp)
+check(CMP0180 "NEW" "${cmp}")
 
 # Test allowing the top-level file to not have cmake_minimum_required.
 cmake_policy(SET CMP0000 OLD)

+ 45 - 47
Tests/PolicyScope/CMakeLists.txt

@@ -12,9 +12,7 @@ endfunction()
 #-----------------------------------------------------------------------------
 # Test using a development framework that sets policies for us.
 
-# Policy CMP0011 should not be set at this point.
-cmake_policy(GET CMP0011 cmp)
-check(CMP0011 "" "${cmp}")
+cmake_policy(SET CMP0011 OLD)
 
 # Put the test modules in the search path.
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
@@ -23,22 +21,22 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 find_package(Foo)
 
 # Check policies set by the package.
-cmake_policy(GET CMP0003 cmp)
-check(CMP0003 "OLD" "${cmp}")
-cmake_policy(GET CMP0002 cmp)
-check(CMP0002 "NEW" "${cmp}")
+cmake_policy(GET CMP0180 cmp)
+check(CMP0180 "OLD" "${cmp}")
+cmake_policy(GET CMP0179 cmp)
+check(CMP0179 "NEW" "${cmp}")
 cmake_policy(GET CMP0011 cmp)
 check(CMP0011 "NEW" "${cmp}")
 
 # Make sure an included file cannot change policies.
 include(Bar)
-cmake_policy(GET CMP0003 cmp)
-check(CMP0003 "OLD" "${cmp}")
+cmake_policy(GET CMP0180 cmp)
+check(CMP0180 "OLD" "${cmp}")
 
 # Allow the included file to change policies.
 include(Bar NO_POLICY_SCOPE)
-cmake_policy(GET CMP0003 cmp)
-check(CMP0003 "NEW" "${cmp}")
+cmake_policy(GET CMP0180 cmp)
+check(CMP0180 "NEW" "${cmp}")
 
 #-----------------------------------------------------------------------------
 # Test function and macro policy recording.
@@ -46,65 +44,65 @@ check(CMP0003 "NEW" "${cmp}")
 # Create the functions in an isolated scope in which we change policies.
 cmake_policy(PUSH)
 if(1)
-  # Change CMP0002
-  cmake_policy(SET CMP0002 OLD)
+  # Change CMP0179
+  cmake_policy(SET CMP0179 OLD)
   function(func1)
-    # CMP0002 should be changed when this function is invoked
-    cmake_policy(GET CMP0002 cmp)
-    check(CMP0002 "OLD" "${cmp}")
+    # CMP0179 should be changed when this function is invoked
+    cmake_policy(GET CMP0179 cmp)
+    check(CMP0179 "OLD" "${cmp}")
 
     # The undocumented PARENT_SCOPE option sees the caller's setting.
-    cmake_policy(GET CMP0002 cmp PARENT_SCOPE)
-    check(CMP0002 "NEW" "${cmp}")
+    cmake_policy(GET CMP0179 cmp PARENT_SCOPE)
+    check(CMP0179 "NEW" "${cmp}")
   endfunction()
 
-  # Unset CMP0002
-  cmake_policy(VERSION 2.4)
+  # Unset CMP0179
+  cmake_policy(VERSION 3.30)
   macro(macro1)
-    # CMP0002 should be unset when this macro is invoked
-    cmake_policy(GET CMP0002 cmp)
-    check(CMP0002 "" "${cmp}")
+    # CMP0179 should be unset when this macro is invoked
+    cmake_policy(GET CMP0179 cmp)
+    check(CMP0179 "" "${cmp}")
 
     # The undocumented PARENT_SCOPE option sees the caller's setting.
-    cmake_policy(GET CMP0002 cmp PARENT_SCOPE)
-    check(CMP0002 "NEW" "${cmp}")
+    cmake_policy(GET CMP0179 cmp PARENT_SCOPE)
+    check(CMP0179 "NEW" "${cmp}")
 
     # Setting the policy should work here and also in the caller.
-    cmake_policy(SET CMP0002 OLD)
-    cmake_policy(GET CMP0002 cmp)
-    check(CMP0002 "OLD" "${cmp}")
+    cmake_policy(SET CMP0179 OLD)
+    cmake_policy(GET CMP0179 cmp)
+    check(CMP0179 "OLD" "${cmp}")
   endmacro()
 endif()
 cmake_policy(POP)
 
-# CMP0002 should still be NEW in this context.
-cmake_policy(GET CMP0002 cmp)
-check(CMP0002 "NEW" "${cmp}")
+# CMP0179 should still be NEW in this context.
+cmake_policy(GET CMP0179 cmp)
+check(CMP0179 "NEW" "${cmp}")
 
 # Check the recorded policies
 func1()
 macro1()
 
-# The macro should have changed CMP0002.
-cmake_policy(GET CMP0002 cmp)
-check(CMP0002 "OLD" "${cmp}")
+# The macro should have changed CMP0179.
+cmake_policy(GET CMP0179 cmp)
+check(CMP0179 "OLD" "${cmp}")
 
 #-----------------------------------------------------------------------------
 # Test CMAKE_POLICY_DEFAULT_CMP<NNNN> variable.
 cmake_policy(PUSH)
-  set(CMAKE_POLICY_DEFAULT_CMP0010 OLD) # ignored
-  set(CMAKE_POLICY_DEFAULT_CMP0012 OLD) # honored
-  set(CMAKE_POLICY_DEFAULT_CMP0013 NEW) # honored
-  set(CMAKE_POLICY_DEFAULT_CMP0014 "")  # noop
-  cmake_policy(VERSION 2.6.3)
-  cmake_policy(GET CMP0010 cmp)
-  check(CMP0010 "NEW" "${cmp}")
-  cmake_policy(GET CMP0012 cmp)
-  check(CMP0012 "OLD" "${cmp}")
-  cmake_policy(GET CMP0013 cmp)
-  check(CMP0013 "NEW" "${cmp}")
-  cmake_policy(GET CMP0014 cmp)
-  check(CMP0014 "" "${cmp}")
+  set(CMAKE_POLICY_DEFAULT_CMP0170 OLD) # ignored
+  set(CMAKE_POLICY_DEFAULT_CMP0171 OLD) # honored
+  set(CMAKE_POLICY_DEFAULT_CMP0172 NEW) # honored
+  set(CMAKE_POLICY_DEFAULT_CMP0173 "")  # noop
+  cmake_policy(VERSION 3.30)
+  cmake_policy(GET CMP0170 cmp)
+  check(CMP0170 "NEW" "${cmp}")
+  cmake_policy(GET CMP0171 cmp)
+  check(CMP0171 "OLD" "${cmp}")
+  cmake_policy(GET CMP0172 cmp)
+  check(CMP0172 "NEW" "${cmp}")
+  cmake_policy(GET CMP0173 cmp)
+  check(CMP0173 "" "${cmp}")
 cmake_policy(POP)
 
 #-----------------------------------------------------------------------------

+ 2 - 2
Tests/PolicyScope/FindFoo.cmake

@@ -1,2 +1,2 @@
-cmake_minimum_required(VERSION 3.10)
-cmake_policy(SET CMP0003 OLD)
+cmake_minimum_required(VERSION 3.31)
+cmake_policy(SET CMP0180 OLD)