From 4567c8205a2c3404ab2e69e6147f3fdd2e1fc9ff Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Fri, 24 Nov 2023 19:00:21 -0500 Subject: Help/dev: Update UseJava export policy version in post-release development --- Help/dev/maint.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst index 81e0e6f..2f8483e 100644 --- a/Help/dev/maint.rst +++ b/Help/dev/maint.rst @@ -332,15 +332,16 @@ Commit with a message such as:: away from setting policies to OLD. Update the ``cmake_policy`` version range generated by ``install(EXPORT)`` -in ``cmExportFileGenerator::GeneratePolicyHeaderCode`` to end at the +in ``cmExportFileGenerator::GeneratePolicyHeaderCode`` and +``install_jar_exports`` in ``javaTargets.cmake.in`` to end at the previous release. We use one release back since we now know all the policies added for that version. Commit with a message such as:: export: Increase maximum policy version in exported files to $prev - The files generated by `install(EXPORT)` and `export()` commands - are known to work with policies as of CMake $prev, so enable them - in sufficiently new CMake versions. + The files generated by `install(EXPORT)`, `export()`, and + `install_jar_exports()` commands are known to work with policies + as of CMake $prev, so enable them in sufficiently new CMake versions. Update the ``cmake_minimum_required`` version range in CMake itself: -- cgit v0.12 From c17268ff0b946a0bee69d2aa17b987091599f7ae Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Fri, 24 Nov 2023 19:09:00 -0500 Subject: UseJava: Increase maximum policy version in exported files to 3.27 Extend commit c5f1af1ffe (export: Increase maximum policy version in exported files to 3.27, 2023-10-03) to cover UseJava too. Fixes: #22655 --- Modules/UseJava/javaTargets.cmake.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Modules/UseJava/javaTargets.cmake.in b/Modules/UseJava/javaTargets.cmake.in index 6e14256..f3670c2 100644 --- a/Modules/UseJava/javaTargets.cmake.in +++ b/Modules/UseJava/javaTargets.cmake.in @@ -1,6 +1,5 @@ -cmake_minimum_required(VERSION 2.8.12) cmake_policy(PUSH) -cmake_policy(VERSION 2.8) +cmake_policy(VERSION 2.8.12...3.27) #---------------------------------------------------------------- # Generated CMake Java target import file. -- cgit v0.12