mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-10 14:41:43 +00:00
aedi: update cmake to 3.25.1
This commit is contained in:
parent
a925b96adc
commit
9e058ac20f
2 changed files with 2 additions and 32 deletions
|
@ -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
|
||||
|
|
|
@ -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;
|
Loading…
Reference in a new issue