Merge topic 'deprecate-pre-3.10' into release-3.31

4c4f173876 Clarify advice given by compatibility deprecation message for CMake < 3.10

Acked-by: Kitware Robot <[email protected]>
Tested-by: buildbot <[email protected]>
Acked-by: Dženan Zukić <[email protected]>
Merge-request: !9996

Source/cmPolicies.cxx

@@ -272,9 +272,9 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile* mf, unsigned int majorVer,
       MessageType::DEPRECATION_WARNING,
       "Compatibility with CMake < 3.10 will be removed from "
       "a future version of CMake.\n"
-      "Update the VERSION argument <min> value or use a ...<max> suffix "
-      "to tell CMake that the project does not need compatibility with "
-      "older versions.");
+      "Update the VERSION argument <min> value.  Or, use the <min>...<max> "
+      "syntax to tell CMake that the project requires at least <min> but has "
+      "been updated to work with policies introduced by <max> or earlier.");
   }
 
   // now loop over all the policies and set them as appropriate

Tests/RunCMake/File_Generate/CMP0070-OLD-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Deprecation Warning at CMP0070-OLD.cmake:[0-9]+ \(cmake_policy\):
   The OLD behavior for policy CMP0070 will be removed from a future version

Tests/RunCMake/File_Generate/CMP0070-WARN-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 (CMake Warning \(dev\) in CMakeLists.txt:
   Policy CMP0070 is not set: Define file\(GENERATE\) behavior for relative

Tests/RunCMake/File_Generate/SourceProperty-CMP0070-OLD-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Deprecation Warning at SourceProperty-CMP0070-OLD.cmake:[0-9]+ \(cmake_policy\):
   The OLD behavior for policy CMP0070 will be removed from a future version

Tests/RunCMake/GenEx-TARGET_PROPERTY/LOCATION-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Warning \(dev\) in CMakeLists\.txt:
   Policy CMP0026 is not set: Disallow use of the LOCATION target property.

Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Deprecation Warning at CMakeLists.txt:[0-9]+ \(cmake_minimum_required\):
   The OLD behavior for policy CMP0052 will be removed from a future version

Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Deprecation Warning at CMakeLists\.txt:[0-9]+ \(cmake_minimum_required\):
   The OLD behavior for policy CMP0052 will be removed from a future version

Tests/RunCMake/LinkItemValidation/CMP0028-OLD-iface-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Deprecation Warning at CMP0028-OLD-iface\.cmake:[0-9]+ \(cmake_policy\):
   The OLD behavior for policy CMP0028 will be removed from a future version

Tests/RunCMake/LinkItemValidation/CMP0028-OLD-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Deprecation Warning at CMP0028-OLD\.cmake:[0-9]+ \(cmake_policy\):
   The OLD behavior for policy CMP0028 will be removed from a future version

Tests/RunCMake/Ninja/CMP0058-OLD-by-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:[0-9] \(include\)
 +

Tests/RunCMake/Ninja/CMP0058-OLD-no-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:[0-9] \(include\)
 +

Tests/RunCMake/Ninja/CMP0058-WARN-by-stderr.txt

@@ -2,7 +2,8 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:[0-9] \(include\)$

Tests/RunCMake/Ninja/CMP0058-WARN-no-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:[0-9] \(include\)
 +

Tests/RunCMake/RunCMake.cmake

@@ -227,8 +227,9 @@ function(run_cmake test)
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 ]] "" actual_stderr "${actual_stderr}")
   endif()

Tests/RunCMake/VisibilityPreset/CMP0063-OLD-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Deprecation Warning at CMP0063-OLD.cmake:[0-9]+ \(cmake_policy\):
   The OLD behavior for policy CMP0063 will be removed from a future version

Tests/RunCMake/VisibilityPreset/CMP0063-WARN-exe-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Warning \(dev\) at CMP0063-WARN-exe.cmake:[0-9]+ \(add_executable\):
   Policy CMP0063 is not set: Honor visibility properties for all target

Tests/RunCMake/VisibilityPreset/CMP0063-WARN-no-stderr.txt

@@ -2,5 +2,6 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.$
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.$

Tests/RunCMake/VisibilityPreset/CMP0063-WARN-obj-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Warning \(dev\) at CMP0063-WARN-obj.cmake:[0-9]+ \(add_library\):
   Policy CMP0063 is not set: Honor visibility properties for all target

Tests/RunCMake/VisibilityPreset/CMP0063-WARN-sta-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Warning \(dev\) at CMP0063-WARN-sta.cmake:[0-9]+ \(add_library\):
   Policy CMP0063 is not set: Honor visibility properties for all target

Tests/RunCMake/cmake_minimum_required/Before3_10-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
 +
@@ -11,8 +12,9 @@ CMake Deprecation Warning at Before3_10\.cmake:2 \(cmake_policy\):
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
 +
@@ -20,7 +22,8 @@ CMake Deprecation Warning at Before3_10\.cmake:6 \(cmake_policy\):
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)$

Tests/RunCMake/cmake_minimum_required/CompatBefore24-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
 +

Tests/RunCMake/ctest_build/BuildFailure-CMP0061-OLD-stderr.txt

@@ -3,7 +3,8 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +(Error\(s\) when building project
 )?ctest_build returned zero$

Tests/RunCMake/include/CMP0024-WARN-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 +

Tests/RunCMake/install/CMP0062-OLD-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:[0-9]+ \(include\)
 +

Tests/RunCMake/list/GET-CMP0007-WARN-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
 +

Tests/RunCMake/project/CMP0048-NEW-stderr.txt

@@ -2,5 +2,6 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.$
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.$

Tests/RunCMake/project/CMP0048-OLD-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 CMake Deprecation Warning at CMP0048-OLD\.cmake:1 \(cmake_policy\):
   The OLD behavior for policy CMP0048 will be removed from a future version

Tests/RunCMake/project_injected/CMP0048-WARN-stderr.txt

@@ -15,5 +15,6 @@ CMake Deprecation Warning at CMakeLists\.txt:1 \(cmake_minimum_required\):
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.$
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.$

Tests/RunCMake/try_compile/CMP0066-stderr.txt

@@ -2,8 +2,9 @@
   Compatibility with CMake < 3\.10 will be removed from a future version of
   CMake\.
 
-  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
-  CMake that the project does not need compatibility with older versions\.
+  Update the VERSION argument <min> value\.  Or, use the <min>\.\.\.<max> syntax
+  to tell CMake that the project requires at least <min> but has been updated
+  to work with policies introduced by <max> or earlier\.
 +
 before try_compile with CMP0066 WARN-default
 after try_compile with CMP0066 WARN-default