mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2025-02-22 03:11:08 +00:00
aedi: patch cmake 3.21.1 to support Xcode 14 project generation
This commit is contained in:
parent
4df6afb2e9
commit
5a2e955771
2 changed files with 31 additions and 1 deletions
|
@ -56,7 +56,8 @@ class BuildCMakeTarget(CMakeTarget):
|
||||||
def prepare_source(self, state: BuildState):
|
def prepare_source(self, state: BuildState):
|
||||||
state.download_source(
|
state.download_source(
|
||||||
'https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1.tar.gz',
|
'https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1.tar.gz',
|
||||||
'fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4')
|
'fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4',
|
||||||
|
patches='cmake-fix-xcode14')
|
||||||
|
|
||||||
def configure(self, state: BuildState):
|
def configure(self, state: BuildState):
|
||||||
# Bootstrap native CMake binary
|
# Bootstrap native CMake binary
|
||||||
|
|
29
patch/cmake-fix-xcode14.diff
Normal file
29
patch/cmake-fix-xcode14.diff
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
--- 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