From 9e058ac20f606351520d9a370d46d0972633bd28 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Tue, 10 Jan 2023 16:42:08 +0200
Subject: [PATCH] aedi: update cmake to 3.25.1

---
 aedi/target/tool_tier1.py    |  5 ++---
 patch/cmake-fix-xcode14.diff | 29 -----------------------------
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 patch/cmake-fix-xcode14.diff

diff --git a/aedi/target/tool_tier1.py b/aedi/target/tool_tier1.py
index ffb33260..0c6ebe9f 100644
--- a/aedi/target/tool_tier1.py
+++ b/aedi/target/tool_tier1.py
@@ -28,9 +28,8 @@ class BuildCMakeTarget(CMakeTarget):
 
     def prepare_source(self, state: BuildState):
         state.download_source(
-            'https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1.tar.gz',
-            'fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4',
-            patches='cmake-fix-xcode14')
+            'https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1.tar.gz',
+            '1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8')
 
     def configure(self, state: BuildState):
         # Bootstrap native CMake binary
diff --git a/patch/cmake-fix-xcode14.diff b/patch/cmake-fix-xcode14.diff
deleted file mode 100644
index 8ddc3224..00000000
--- a/patch/cmake-fix-xcode14.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Modules/CMakeDetermineCompilerId.cmake
-+++ b/Modules/CMakeDetermineCompilerId.cmake
-@@ -614,6 +614,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
-       endif()
-     endif()
-     if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT MATCHES "^$|[Mm][Aa][Cc][Oo][Ss]")
-+      set(id_code_sign_identity "-")
-       # When targeting macOS, use only the host architecture.
-       if (_CMAKE_APPLE_ARCHS_DEFAULT)
-         set(id_archs "ARCHS = \"${_CMAKE_APPLE_ARCHS_DEFAULT}\";")
-@@ -623,6 +624,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
-         set(id_arch_active "ONLY_ACTIVE_ARCH = YES;")
-       endif()
-     else()
-+      set(id_code_sign_identity "")
-       set(id_archs "")
-       set(id_arch_active "ONLY_ACTIVE_ARCH = YES;")
-     endif()
---- a/Modules/CompilerId/Xcode-3.pbxproj.in
-+++ b/Modules/CompilerId/Xcode-3.pbxproj.in
-@@ -72,7 +72,7 @@
- 		1DEB928608733DD80010E9CD = {
- 			isa = XCBuildConfiguration;
- 			buildSettings = {
--				CODE_SIGN_IDENTITY = "";
-+				CODE_SIGN_IDENTITY = "@id_code_sign_identity@";
- 				PRODUCT_NAME = CompilerId@id_lang@;
- 			};
- 			name = Debug;