Skip to content

Commit 30da88b

Browse files
debuglydebugly
committed
【libyuv】update patch
1 parent 7c9ce2b commit 30da88b

File tree

2 files changed

+102
-42
lines changed

2 files changed

+102
-42
lines changed

patches/yuv/0001-skip-binary-and-shared-lib-and-jpeg.patch renamed to patches/yuv/0001-fix-cmake-build-error.patch

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
From ec40a559327d80f3333c17a1f9e9c516bb073753 Mon Sep 17 00:00:00 2001
1+
From 9d49b6da04e66e8fcc27cc809474fe6460007c74 Mon Sep 17 00:00:00 2001
22
From: qianlongxu <[email protected]>
3-
Date: Thu, 4 Dec 2025 10:11:52 +0800
4-
Subject: [PATCH] skip binary and shared lib and jpeg
3+
Date: Mon, 8 Dec 2025 11:12:10 +0800
4+
Subject: [PATCH] fix cmake build error
55

66
---
7-
CMakeLists.txt | 11 ++++++++++-
8-
1 file changed, 10 insertions(+), 1 deletion(-)
7+
CMakeLists.txt | 13 +++++++++++--
8+
1 file changed, 11 insertions(+), 2 deletions(-)
99

1010
diff --git a/CMakeLists.txt b/CMakeLists.txt
11-
index 9abfa74..898a6be 100644
11+
index 9abfa74..fcebbdb 100644
1212
--- a/CMakeLists.txt
1313
+++ b/CMakeLists.txt
14-
@@ -5,6 +5,7 @@
14+
@@ -3,8 +3,9 @@
15+
# Run with -DTEST=ON to build unit tests
16+
1517
PROJECT ( YUV C CXX ) # "C" is required even for C++ projects
16-
CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
18+
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
19+
+CMAKE_MINIMUM_REQUIRED( VERSION 3...4 )
1720
OPTION( UNIT_TEST "Built unit tests" OFF )
1821
+OPTION( BINARY "Built binary" OFF )
1922

@@ -45,14 +48,13 @@ index 9abfa74..898a6be 100644
4548

4649
if(UNIT_TEST)
4750
find_library(GTEST_LIBRARY gtest)
48-
@@ -97,10 +102,14 @@ if(UNIT_TEST)
51+
@@ -97,12 +102,16 @@ if(UNIT_TEST)
4952
endif()
5053

5154

5255
+if(BINARY)
5356
# install the conversion tool, .so, .a, and all the header files
54-
-INSTALL ( PROGRAMS ${CMAKE_BINARY_DIR}/yuvconvert DESTINATION bin )
55-
+INSTALL ( PROGRAMS ${CMAKE_BINARY_DIR}/yuvconvert DESTINATION bin )
57+
INSTALL ( PROGRAMS ${CMAKE_BINARY_DIR}/yuvconvert DESTINATION bin )
5658
+endif()
5759
INSTALL ( TARGETS ${ly_lib_static} DESTINATION lib )
5860
+if(BUILD_SHARED_LIBS)
@@ -61,6 +63,9 @@ index 9abfa74..898a6be 100644
6163
INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include )
6264

6365
# create the .deb and .rpm packages using cpack
66+
-INCLUDE ( CM_linux_packages.cmake )
67+
+# INCLUDE ( CM_linux_packages.cmake )
68+
6469
--
6570
2.50.1 (Apple Git-155)
6671

‎tools/ios.toolchain.cmake‎

Lines changed: 86 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
# WATCHOSCOMBINED = Build for armv7k arm64_32 x86_64 watchOS + watchOS Simulator. Combined into FAT STATIC lib (only supported on 3.14+ of CMake with "-G Xcode" argument in combination with the "cmake --install" CMake build step)
7575
# SIMULATOR_WATCHOS = Build for x86_64 for watchOS Simulator.
7676
# SIMULATORARM64_WATCHOS = Build for arm64 for watchOS Simulator.
77+
# SIMULATOR_WATCHOSCOMBINED = Build for arm64 x86_64 for watchOS Simulator. Combined into FAT STATIC lib (supported on 3.14+ of CMakewith "-G Xcode" argument ONLY)
7778
# MAC = Build for x86_64 macOS.
7879
# MAC_ARM64 = Build for Apple Silicon macOS.
7980
# MAC_UNIVERSAL = Combined build for x86_64 and Apple Silicon on macOS.
@@ -98,6 +99,7 @@
9899
# ON (default) = Will require "enable_language(OBJC) and/or enable_language(OBJCXX)" for full OBJC|OBJCXX support
99100
# OFF = Will embed the OBJC and OBJCXX flags into the CMAKE_C_FLAGS and CMAKE_CXX_FLAGS (legacy behavior, CMake version < 3.16)
100101
#
102+
# ENABLE_BITCODE: (ON|OFF) Enables or disables bitcode support. Default OFF
101103
#
102104
# ENABLE_ARC: (ON|OFF) Enables or disables ARC support. Default ON (ARC enabled by default)
103105
#
@@ -165,9 +167,9 @@ set(ENV{_IOS_TOOLCHAIN_HAS_RUN} true)
165167
list(APPEND _supported_platforms
166168
"OS" "OS64" "OS64COMBINED" "SIMULATOR" "SIMULATOR64" "SIMULATORARM64" "SIMULATOR64COMBINED"
167169
"TVOS" "TVOSCOMBINED" "SIMULATOR_TVOS" "SIMULATORARM64_TVOS"
168-
"WATCHOS" "WATCHOSCOMBINED" "SIMULATOR_WATCHOS" "SIMULATORARM64_WATCHOS"
170+
"WATCHOS" "WATCHOSCOMBINED" "SIMULATOR_WATCHOS" "SIMULATORARM64_WATCHOS" "SIMULATOR_WATCHOSCOMBINED"
169171
"MAC" "MAC_ARM64" "MAC_UNIVERSAL"
170-
"VISIONOS" "SIMULATOR_VISIONOS" "VISIONOSCOMBINED"
172+
"VISIONOS" "SIMULATOR_VISIONOS" "VISIONOSCOMBINED"
171173
"MAC_CATALYST" "MAC_CATALYST_ARM64" "MAC_CATALYST_UNIVERSAL")
172174

173175
# Cache what generator is used
@@ -263,28 +265,28 @@ set(NAMED_LANGUAGE_SUPPORT_INT ${NAMED_LANGUAGE_SUPPORT} CACHE BOOL
263265
# Specify the minimum version of the deployment target.
264266
if(NOT DEFINED DEPLOYMENT_TARGET)
265267
if (PLATFORM MATCHES "WATCHOS")
266-
# Unless specified, SDK version 4.0 is used by default as minimum target version (watchOS).
268+
# Unless specified, SDK version 6.0 is used by default as minimum target version (watchOS).
267269
set(DEPLOYMENT_TARGET "6.0")
268270
elseif(PLATFORM STREQUAL "MAC")
269271
# Unless specified, SDK version 10.13 (High Sierra) is used by default as the minimum target version (macos).
270-
set(DEPLOYMENT_TARGET "10.11")
272+
set(DEPLOYMENT_TARGET "10.13")
271273
elseif(PLATFORM STREQUAL "VISIONOS" OR PLATFORM STREQUAL "SIMULATOR_VISIONOS" OR PLATFORM STREQUAL "VISIONOSCOMBINED")
272274
# Unless specified, SDK version 1.0 is used by default as minimum target version (visionOS).
273275
set(DEPLOYMENT_TARGET "1.0")
274276
elseif(PLATFORM STREQUAL "MAC_ARM64")
275277
# Unless specified, SDK version 11.0 (Big Sur) is used by default as the minimum target version (macOS on arm).
276-
set(DEPLOYMENT_TARGET "10.11")
278+
set(DEPLOYMENT_TARGET "11.0")
277279
elseif(PLATFORM STREQUAL "MAC_UNIVERSAL")
278-
# Unless specified, SDK version 11.0 (Big Sur) is used by default as minimum target version for universal builds.
279-
set(DEPLOYMENT_TARGET "10.11")
280+
# Unless specified, SDK version 10.13 (High Sierra) is used by default as minimum target version for universal builds.
281+
set(DEPLOYMENT_TARGET "10.13")
280282
elseif(PLATFORM STREQUAL "MAC_CATALYST" OR PLATFORM STREQUAL "MAC_CATALYST_ARM64" OR PLATFORM STREQUAL "MAC_CATALYST_UNIVERSAL")
281-
# Unless specified, SDK version 13.0 is used by default as the minimum target version (mac catalyst minimum requirement).
283+
# Unless specified, SDK version 13.1 is used by default as the minimum target version (mac catalyst minimum requirement).
282284
set(DEPLOYMENT_TARGET "13.1")
283285
else()
284-
# Unless specified, SDK version 11.0 is used by default as the minimum target version (iOS, tvOS).
285-
set(DEPLOYMENT_TARGET "11.0")
286+
# Unless specified, SDK version 13.0 is used by default as the minimum target version (iOS, tvOS).
287+
set(DEPLOYMENT_TARGET "13.0")
286288
endif()
287-
message(STATUS "[DEFAULTS] Using the default min-version (${DEPLOYMENT_TARGET}) since DEPLOYMENT_TARGET not provided!")
289+
message(STATUS "[DEFAULTS] Using the default min-version since DEPLOYMENT_TARGET not provided!")
288290
elseif(DEFINED DEPLOYMENT_TARGET AND PLATFORM MATCHES "^MAC_CATALYST" AND ${DEPLOYMENT_TARGET} VERSION_LESS "13.1")
289291
message(FATAL_ERROR "Mac Catalyst builds requires a minimum deployment target of 13.1!")
290292
endif()
@@ -315,13 +317,13 @@ if(PLATFORM_INT STREQUAL "OS")
315317
set(ARCHS armv7 armv7s arm64)
316318
set(APPLE_TARGET_TRIPLE_INT arm-apple-ios${DEPLOYMENT_TARGET})
317319
else()
318-
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET})
320+
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET})
319321
endif()
320322
elseif(PLATFORM_INT STREQUAL "OS64")
321323
set(SDK_NAME iphoneos)
322324
if(NOT ARCHS)
323325
if (XCODE_VERSION_INT VERSION_GREATER 10.0)
324-
set(ARCHS arm64) # FIXME: Add arm64e when Apple has fixed the integration issues with it
326+
set(ARCHS arm64) # FIXME: Add arm64e when Apple has fixed the integration issues with it, libarclite_iphoneos.a is currently missing bitcode markers for example
325327
else()
326328
set(ARCHS arm64)
327329
endif()
@@ -358,7 +360,7 @@ elseif(PLATFORM_INT STREQUAL "SIMULATOR64COMBINED")
358360
if(MODERN_CMAKE)
359361
if(NOT ARCHS)
360362
if (XCODE_VERSION_INT VERSION_GREATER 12.0)
361-
set(ARCHS arm64 x86_64) # FIXME: Add arm64e when Apple have fixed the integration issues with it
363+
set(ARCHS arm64 x86_64) # FIXME: Add arm64e when Apple have fixed the integration issues with it, libarclite_iphoneos.a is currently missing bitcode markers for example
362364
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "")
363365
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "x86_64 arm64")
364366
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "")
@@ -460,12 +462,12 @@ elseif(PLATFORM_INT STREQUAL "WATCHOSCOMBINED")
460462
if(MODERN_CMAKE)
461463
if(NOT ARCHS)
462464
if (XCODE_VERSION_INT VERSION_GREATER 10.0)
463-
set(ARCHS armv7k arm64_32 i386)
464-
set(APPLE_TARGET_TRIPLE_INT arm64_32-i386-apple-watchos${DEPLOYMENT_TARGET})
465+
set(ARCHS armv7k arm64_32 x86_64)
466+
set(APPLE_TARGET_TRIPLE_INT arm64_32-x86_64-apple-watchos${DEPLOYMENT_TARGET})
465467
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "armv7k arm64_32")
466-
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386")
468+
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "x86_64")
467469
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "armv7k arm64_32")
468-
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "i386")
470+
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "x86_64")
469471
else()
470472
set(ARCHS armv7k i386)
471473
set(APPLE_TARGET_TRIPLE_INT arm-i386-apple-watchos${DEPLOYMENT_TARGET})
@@ -483,8 +485,13 @@ elseif(PLATFORM_INT STREQUAL "WATCHOSCOMBINED")
483485
elseif(PLATFORM_INT STREQUAL "SIMULATOR_WATCHOS")
484486
set(SDK_NAME watchsimulator)
485487
if(NOT ARCHS)
486-
set(ARCHS i386)
487-
set(APPLE_TARGET_TRIPLE_INT i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
488+
if (XCODE_VERSION_INT VERSION_GREATER 10.0)
489+
set(ARCHS x86_64)
490+
set(APPLE_TARGET_TRIPLE_INT x86_64-apple-watchos${DEPLOYMENT_TARGET}-simulator)
491+
else()
492+
set(ARCHS i386)
493+
set(APPLE_TARGET_TRIPLE_INT i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
494+
endif()
488495
else()
489496
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator)
490497
endif()
@@ -496,6 +503,31 @@ elseif(PLATFORM_INT STREQUAL "SIMULATORARM64_WATCHOS")
496503
else()
497504
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator)
498505
endif()
506+
elseif(PLATFORM_INT STREQUAL "SIMULATOR_WATCHOSCOMBINED")
507+
set(SDK_NAME watchsimulator)
508+
if(MODERN_CMAKE)
509+
if(NOT ARCHS)
510+
if (XCODE_VERSION_INT VERSION_GREATER 12.0)
511+
set(ARCHS arm64 x86_64)
512+
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "")
513+
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "arm64 x86_64")
514+
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "")
515+
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "arm64 x86_64")
516+
set(APPLE_TARGET_TRIPLE_INT arm64_x86_64-apple-watchos${DEPLOYMENT_TARGET}-simulator)
517+
else()
518+
set(ARCHS arm64 i386)
519+
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "")
520+
set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386")
521+
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "")
522+
set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "i386")
523+
set(APPLE_TARGET_TRIPLE_INT arm64_i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
524+
endif()
525+
else()
526+
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator)
527+
endif()
528+
else()
529+
message(FATAL_ERROR "Please make sure that you are running CMake 3.14+ to make the SIMULATOR_WATCHOSCOMBINED setting work")
530+
endif()
499531
elseif(PLATFORM_INT STREQUAL "SIMULATOR_VISIONOS")
500532
set(SDK_NAME xrsimulator)
501533
if(NOT ARCHS)
@@ -553,15 +585,16 @@ elseif(PLATFORM_INT STREQUAL "MAC_UNIVERSAL")
553585
if(NOT ARCHS)
554586
set(ARCHS "x86_64;arm64")
555587
endif()
556-
string(REPLACE ";" "-" ARCHS_SPLIT "${ARCHS}")
557-
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-macosx${DEPLOYMENT_TARGET})
588+
# For universal builds, don't set target triple - let CMake handle it
589+
# string(REPLACE ";" "-" ARCHS_SPLIT "${ARCHS}")
590+
# set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-macosx${DEPLOYMENT_TARGET})
558591
elseif(PLATFORM_INT STREQUAL "MAC_CATALYST_UNIVERSAL")
559592
set(SDK_NAME macosx)
560593
if(NOT ARCHS)
561594
set(ARCHS "x86_64;arm64")
562595
endif()
563596
string(REPLACE ";" "-" ARCHS_SPLIT "${ARCHS}")
564-
set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-ios${DEPLOYMENT_TARGET}-macabi)
597+
set(APPLE_TARGET_TRIPLE_INT apple-ios${DEPLOYMENT_TARGET}-macabi)
565598
else()
566599
message(FATAL_ERROR "Invalid PLATFORM: ${PLATFORM_INT}")
567600
endif()
@@ -616,6 +649,13 @@ elseif(DEFINED CMAKE_OSX_SYSROOT_INT)
616649
set(CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT_INT}" CACHE INTERNAL "")
617650
endif()
618651

652+
# Use bitcode or not
653+
if(NOT DEFINED ENABLE_BITCODE)
654+
message(STATUS "[DEFAULTS] Disabling bitcode support by default. ENABLE_BITCODE not provided for override!")
655+
set(ENABLE_BITCODE OFF)
656+
endif()
657+
set(ENABLE_BITCODE_INT ${ENABLE_BITCODE} CACHE BOOL
658+
"Whether or not to enable bitcode" FORCE)
619659
# Use ARC or not
620660
if(NOT DEFINED ENABLE_ARC)
621661
# Unless specified, enable ARC support by default
@@ -869,6 +909,15 @@ if(PLATFORM_INT MATCHES "^MAC_CATALYST")
869909
set(C_TARGET_FLAGS "-isystem ${CMAKE_OSX_SYSROOT_INT}/System/iOSSupport/usr/include -iframework ${CMAKE_OSX_SYSROOT_INT}/System/iOSSupport/System/Library/Frameworks")
870910
endif()
871911

912+
if(ENABLE_BITCODE_INT)
913+
set(BITCODE "-fembed-bitcode")
914+
set(CMAKE_XCODE_ATTRIBUTE_BITCODE_GENERATION_MODE "bitcode")
915+
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")
916+
else()
917+
set(BITCODE "")
918+
set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
919+
endif()
920+
872921
if(ENABLE_ARC_INT)
873922
set(FOBJC_ARC "-fobjc-arc")
874923
set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC "YES")
@@ -907,26 +956,26 @@ endif()
907956
if(CMAKE_GENERATOR MATCHES "Xcode")
908957
message(STATUS "Not setting any manual command-line buildflags, since Xcode is selected as the generator. Modifying the Xcode build-settings directly instead.")
909958
else()
910-
set(CMAKE_C_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${OBJC_LEGACY_VARS} ${VISIBILITY} ${CMAKE_C_FLAGS}" CACHE INTERNAL
959+
set(CMAKE_C_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${OBJC_LEGACY_VARS} ${BITCODE} ${VISIBILITY} ${CMAKE_C_FLAGS}" CACHE INTERNAL
911960
"Flags used by the compiler during all C build types.")
912961
set(CMAKE_C_FLAGS_DEBUG "-O0 -g ${CMAKE_C_FLAGS_DEBUG}")
913962
set(CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_C_FLAGS_MINSIZEREL}")
914963
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2 -g ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
915964
set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O3 ${CMAKE_C_FLAGS_RELEASE}")
916-
set(CMAKE_CXX_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${OBJC_LEGACY_VARS} ${VISIBILITY} ${CMAKE_CXX_FLAGS}" CACHE INTERNAL
965+
set(CMAKE_CXX_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${OBJC_LEGACY_VARS} ${BITCODE} ${VISIBILITY} ${CMAKE_CXX_FLAGS}" CACHE INTERNAL
917966
"Flags used by the compiler during all CXX build types.")
918967
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${CMAKE_CXX_FLAGS_DEBUG}")
919968
set(CMAKE_CXX_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_CXX_FLAGS_MINSIZEREL}")
920969
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2 -g ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
921970
set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 ${CMAKE_CXX_FLAGS_RELEASE}")
922971
if(NAMED_LANGUAGE_SUPPORT_INT)
923-
set(CMAKE_OBJC_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${VISIBILITY} ${FOBJC_ARC} ${OBJC_VARS} ${CMAKE_OBJC_FLAGS}" CACHE INTERNAL
972+
set(CMAKE_OBJC_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${BITCODE} ${VISIBILITY} ${FOBJC_ARC} ${OBJC_VARS} ${CMAKE_OBJC_FLAGS}" CACHE INTERNAL
924973
"Flags used by the compiler during all OBJC build types.")
925974
set(CMAKE_OBJC_FLAGS_DEBUG "-O0 -g ${CMAKE_OBJC_FLAGS_DEBUG}")
926975
set(CMAKE_OBJC_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_OBJC_FLAGS_MINSIZEREL}")
927976
set(CMAKE_OBJC_FLAGS_RELWITHDEBINFO "-DNDEBUG -O2 -g ${CMAKE_OBJC_FLAGS_RELWITHDEBINFO}")
928977
set(CMAKE_OBJC_FLAGS_RELEASE "-DNDEBUG -O3 ${CMAKE_OBJC_FLAGS_RELEASE}")
929-
set(CMAKE_OBJCXX_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${VISIBILITY} ${FOBJC_ARC} ${OBJC_VARS} ${CMAKE_OBJCXX_FLAGS}" CACHE INTERNAL
978+
set(CMAKE_OBJCXX_FLAGS "${C_TARGET_FLAGS} ${APPLE_TARGET_TRIPLE_FLAG} ${SDK_NAME_VERSION_FLAGS} ${BITCODE} ${VISIBILITY} ${FOBJC_ARC} ${OBJC_VARS} ${CMAKE_OBJCXX_FLAGS}" CACHE INTERNAL
930979
"Flags used by the compiler during all OBJCXX build types.")
931980
set(CMAKE_OBJCXX_FLAGS_DEBUG "-O0 -g ${CMAKE_OBJCXX_FLAGS_DEBUG}")
932981
set(CMAKE_OBJCXX_FLAGS_MINSIZEREL "-DNDEBUG -Os ${CMAKE_OBJCXX_FLAGS_MINSIZEREL}")
@@ -943,7 +992,7 @@ else()
943992
set(CMAKE_OBJCXX_LINK_FLAGS "${C_TARGET_FLAGS} ${SDK_NAME_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_OBJCXX_LINK_FLAGS}" CACHE INTERNAL
944993
"Flags used by the compiler for all OBJCXX link types.")
945994
endif()
946-
set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp -arch ${CMAKE_OSX_ARCHITECTURES} ${APPLE_TARGET_TRIPLE_FLAG}" CACHE INTERNAL
995+
set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp" CACHE INTERNAL
947996
"Flags used by the compiler for all ASM build types.")
948997
endif()
949998

@@ -973,6 +1022,11 @@ if(DEFINED SDK_NAME_VERSION_FLAGS)
9731022
message(STATUS "Using version flags: ${SDK_NAME_VERSION_FLAGS}")
9741023
endif()
9751024
message(STATUS "Using a data_ptr size of: ${CMAKE_CXX_SIZEOF_DATA_PTR}")
1025+
if(ENABLE_BITCODE_INT)
1026+
message(STATUS "Bitcode: Enabled")
1027+
else()
1028+
message(STATUS "Bitcode: Disabled")
1029+
endif()
9761030

9771031
if(ENABLE_ARC_INT)
9781032
message(STATUS "ARC: Enabled")
@@ -1002,6 +1056,7 @@ set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
10021056
DEPLOYMENT_TARGET
10031057
CMAKE_DEVELOPER_ROOT
10041058
CMAKE_OSX_SYSROOT_INT
1059+
ENABLE_BITCODE
10051060
ENABLE_ARC
10061061
CMAKE_ASM_COMPILER
10071062
CMAKE_C_COMPILER
@@ -1026,7 +1081,7 @@ set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
10261081
)
10271082

10281083
if(NAMED_LANGUAGE_SUPPORT_INT)
1029-
list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
1084+
list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
10301085
CMAKE_OBJC_FLAGS
10311086
CMAKE_OBJC_DEBUG
10321087
CMAKE_OBJC_MINSIZEREL
@@ -1064,7 +1119,7 @@ IF(NOT DEFINED CMAKE_FIND_FRAMEWORK)
10641119
ENDIF(NOT DEFINED CMAKE_FIND_FRAMEWORK)
10651120

10661121
# Set up the default search directories for frameworks.
1067-
if(PLATFORM_INT MATCHES "^MAC_CATALYST")
1122+
if(PLATFORM_INT MATCHES "^MAC_CATALYST")
10681123
set(CMAKE_FRAMEWORK_PATH
10691124
${CMAKE_DEVELOPER_ROOT}/Library/PrivateFrameworks
10701125
${CMAKE_OSX_SYSROOT_INT}/System/Library/Frameworks
@@ -1119,4 +1174,4 @@ macro(find_host_package)
11191174
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
11201175
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
11211176
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
1122-
endmacro(find_host_package)
1177+
endmacro(find_host_package)

0 commit comments

Comments
 (0)