@@ -311,7 +311,7 @@ elseif(PLATFORM_INT STREQUAL "OS64")
311311 else ()
312312 set (ARCHS arm64)
313313 endif ()
314- set (APPLE_TARGET_TRIPLE_INT aarch64 -apple -ios${DEPLOYMENT_TARGET} )
314+ set (APPLE_TARGET_TRIPLE_INT arm64 -apple -ios${DEPLOYMENT_TARGET} )
315315 else ()
316316 set (APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT} -apple -ios${DEPLOYMENT_TARGET} )
317317 endif ()
@@ -332,7 +332,7 @@ elseif(PLATFORM_INT STREQUAL "OS64COMBINED")
332332 set (CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "arm64" )
333333 set (CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "x86_64" )
334334 endif ()
335- set (APPLE_TARGET_TRIPLE_INT aarch64 -x86_64-apple -ios${DEPLOYMENT_TARGET} )
335+ set (APPLE_TARGET_TRIPLE_INT arm64 -x86_64-apple -ios${DEPLOYMENT_TARGET} )
336336 else ()
337337 set (APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT} -apple -ios${DEPLOYMENT_TARGET} )
338338 endif ()
@@ -360,15 +360,15 @@ elseif(PLATFORM_INT STREQUAL "SIMULATORARM64")
360360 set (SDK_NAME iphonesimulator)
361361 if (NOT ARCHS)
362362 set (ARCHS arm64)
363- set (APPLE_TARGET_TRIPLE_INT aarch64 -apple -ios${DEPLOYMENT_TARGET} -simulator)
363+ set (APPLE_TARGET_TRIPLE_INT arm64 -apple -ios${DEPLOYMENT_TARGET} -simulator)
364364 else ()
365365 set (APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT} -apple -ios${DEPLOYMENT_TARGET} -simulator)
366366 endif ()
367367elseif (PLATFORM_INT STREQUAL "TVOS" )
368368 set (SDK_NAME appletvos)
369369 if (NOT ARCHS)
370370 set (ARCHS arm64)
371- set (APPLE_TARGET_TRIPLE_INT aarch64 -apple -tvos${DEPLOYMENT_TARGET} )
371+ set (APPLE_TARGET_TRIPLE_INT arm64 -apple -tvos${DEPLOYMENT_TARGET} )
372372 else ()
373373 set (APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT} -apple -tvos${DEPLOYMENT_TARGET} )
374374 endif ()
@@ -377,7 +377,7 @@ elseif (PLATFORM_INT STREQUAL "TVOSCOMBINED")
377377 if (MODERN_CMAKE)
378378 if (NOT ARCHS)
379379 set (ARCHS arm64 x86_64)
380- set (APPLE_TARGET_TRIPLE_INT aarch64 -x86_64-apple -tvos${DEPLOYMENT_TARGET} )
380+ set (APPLE_TARGET_TRIPLE_INT arm64 -x86_64-apple -tvos${DEPLOYMENT_TARGET} )
381381 set (CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=appletvos*] "arm64" )
382382 set (CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=appletvsimulator*] "x86_64" )
383383 set (CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=appletvos*] "arm64" )
@@ -401,7 +401,7 @@ elseif(PLATFORM_INT STREQUAL "WATCHOS")
401401 if (NOT ARCHS)
402402 if (XCODE_VERSION_INT VERSION_GREATER 10.0)
403403 set (ARCHS armv7k arm64_32)
404- set (APPLE_TARGET_TRIPLE_INT aarch64_32 -apple -watchos${DEPLOYMENT_TARGET} )
404+ set (APPLE_TARGET_TRIPLE_INT arm64_32 -apple -watchos${DEPLOYMENT_TARGET} )
405405 else ()
406406 set (ARCHS armv7k)
407407 set (APPLE_TARGET_TRIPLE_INT arm-apple -watchos${DEPLOYMENT_TARGET} )
@@ -415,7 +415,7 @@ elseif(PLATFORM_INT STREQUAL "WATCHOSCOMBINED")
415415 if (NOT ARCHS)
416416 if (XCODE_VERSION_INT VERSION_GREATER 10.0)
417417 set (ARCHS armv7k arm64_32 i386)
418- set (APPLE_TARGET_TRIPLE_INT aarch64_32 -i386-apple -watchos${DEPLOYMENT_TARGET} )
418+ set (APPLE_TARGET_TRIPLE_INT arm64_32 -i386-apple -watchos${DEPLOYMENT_TARGET} )
419419 set (CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "armv7k arm64_32" )
420420 set (CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386" )
421421 set (CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "armv7k arm64_32" )
@@ -679,9 +679,6 @@ elseif(PLATFORM STREQUAL "MAC_CATALYST" OR PLATFORM STREQUAL "MAC_CATALYST_ARM64
679679else ()
680680 set (IOS ON CACHE BOOL "" )
681681endif ()
682- set (CMAKE_AR ar CACHE FILEPATH "" FORCE)
683- set (CMAKE_RANLIB ranlib CACHE FILEPATH "" FORCE)
684- set (CMAKE_STRIP strip CACHE FILEPATH "" FORCE)
685682# Set the architectures for which to build.
686683set (CMAKE_OSX_ARCHITECTURES ${ARCHS} CACHE INTERNAL "" )
687684# Change the type of target generated for try_compile() so it'll work when cross-compiling, weak compiler checks
0 commit comments