Jelajahi Sumber

Merge topic 'ci-cmake-update' into release-3.24

05a1464689 ci: use CMake 3.24.1
c3793b4157 CMake 3.24.1

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !7590
Brad King 3 tahun lalu
induk
melakukan
810ab9b24d
4 mengubah file dengan 10 tambahan dan 9 penghapusan
  1. 2 2
      .gitlab/ci/cmake.ps1
  2. 4 4
      .gitlab/ci/cmake.sh
  3. 3 2
      Help/release/3.24.rst
  4. 1 1
      Source/CMakeVersion.cmake

+ 2 - 2
.gitlab/ci/cmake.ps1

@@ -1,7 +1,7 @@
 $erroractionpreference = "stop"
 
-$version = "3.24.0-rc1"
-$sha256sum = "8D075F5C663263713008FB77E31956C808D3A30074C3655F16EB76A0800F99D6"
+$version = "3.24.1"
+$sha256sum = "C1B17431A16337D517F7BA78C7067B6F143A12686CB8087F3DD32F3FA45F5AAE"
 $filename = "cmake-$version-windows-x86_64"
 $tarball = "$filename.zip"
 

+ 4 - 4
.gitlab/ci/cmake.sh

@@ -2,22 +2,22 @@
 
 set -e
 
-readonly version="3.24.0-rc1"
+readonly version="3.24.1"
 
 case "$(uname -s)-$(uname -m)" in
     Linux-x86_64)
         shatool="sha256sum"
-        sha256sum="183ff011a2177d0a683e81d645d02c0ed8ff790449158522928ef069775091cc"
+        sha256sum="827bf068cfaa23a9fb95f990c9f8a7ed8f2caeb3af62b5c0a2fed7a8dd6dde3e"
         platform="linux-x86_64"
         ;;
     Linux-aarch64)
         shatool="sha256sum"
-        sha256sum="f26642d5bc503de6bf7dd2d06afb8777d5862aa44e556cdf4155fec60e534d04"
+        sha256sum="d50c40135df667ed659f8e4eb7cf7d53421250304f7b3e1a70af9cf3d0f2ab18"
         platform="linux-aarch64"
         ;;
     Darwin-*)
         shatool="shasum -a 256"
-        sha256sum="417fde30f2cf96f53eaf27b1e510924ce441f0449e53974f2156cb19d32978b9"
+        sha256sum="71bb8db69826d74c395a3c3bbf8b773dbe9f54a2c7331266ba70da303e9c97a1"
         platform="macos-universal"
         ;;
     *)

+ 3 - 2
Help/release/3.24.rst

@@ -362,5 +362,6 @@ Changes made since CMake 3.24.0 include the following.
 3.24.1
 ------
 
-* The :prop_tgt:`COMPILE_WARNING_AS_ERROR` target property now supports the
-  TI compiler.
+* This version made no changes to documented features or interfaces.
+  Some implementation updates were made to support ecosystem changes
+  and/or fix regressions.

+ 1 - 1
Source/CMakeVersion.cmake

@@ -1,7 +1,7 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 24)
-set(CMake_VERSION_PATCH 0)
+set(CMake_VERSION_PATCH 1)
 #set(CMake_VERSION_RC 0)
 set(CMake_VERSION_IS_DIRTY 0)