@@ -311,7 +311,7 @@ elseif(PLATFORM_INT STREQUAL "OS64")
311
311
else ()
312
312
set (ARCHS arm64)
313
313
endif ()
314
- set (APPLE_TARGET_TRIPLE_INT aarch64 -apple -ios${DEPLOYMENT_TARGET} )
314
+ set (APPLE_TARGET_TRIPLE_INT arm64 -apple -ios${DEPLOYMENT_TARGET} )
315
315
else ()
316
316
set (APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT} -apple -ios${DEPLOYMENT_TARGET} )
317
317
endif ()
@@ -332,7 +332,7 @@ elseif(PLATFORM_INT STREQUAL "OS64COMBINED")
332
332
set (CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "arm64" )
333
333
set (CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "x86_64" )
334
334
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} )
336
336
else ()
337
337
set (APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT} -apple -ios${DEPLOYMENT_TARGET} )
338
338
endif ()
@@ -360,15 +360,15 @@ elseif(PLATFORM_INT STREQUAL "SIMULATORARM64")
360
360
set (SDK_NAME iphonesimulator)
361
361
if (NOT ARCHS)
362
362
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)
364
364
else ()
365
365
set (APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT} -apple -ios${DEPLOYMENT_TARGET} -simulator)
366
366
endif ()
367
367
elseif (PLATFORM_INT STREQUAL "TVOS" )
368
368
set (SDK_NAME appletvos)
369
369
if (NOT ARCHS)
370
370
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} )
372
372
else ()
373
373
set (APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT} -apple -tvos${DEPLOYMENT_TARGET} )
374
374
endif ()
@@ -377,7 +377,7 @@ elseif (PLATFORM_INT STREQUAL "TVOSCOMBINED")
377
377
if (MODERN_CMAKE)
378
378
if (NOT ARCHS)
379
379
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} )
381
381
set (CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=appletvos*] "arm64" )
382
382
set (CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=appletvsimulator*] "x86_64" )
383
383
set (CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=appletvos*] "arm64" )
@@ -401,7 +401,7 @@ elseif(PLATFORM_INT STREQUAL "WATCHOS")
401
401
if (NOT ARCHS)
402
402
if (XCODE_VERSION_INT VERSION_GREATER 10.0)
403
403
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} )
405
405
else ()
406
406
set (ARCHS armv7k)
407
407
set (APPLE_TARGET_TRIPLE_INT arm-apple -watchos${DEPLOYMENT_TARGET} )
@@ -415,7 +415,7 @@ elseif(PLATFORM_INT STREQUAL "WATCHOSCOMBINED")
415
415
if (NOT ARCHS)
416
416
if (XCODE_VERSION_INT VERSION_GREATER 10.0)
417
417
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} )
419
419
set (CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "armv7k arm64_32" )
420
420
set (CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386" )
421
421
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
679
679
else ()
680
680
set (IOS ON CACHE BOOL "" )
681
681
endif ()
682
- set (CMAKE_AR ar CACHE FILEPATH "" FORCE)
683
- set (CMAKE_RANLIB ranlib CACHE FILEPATH "" FORCE)
684
- set (CMAKE_STRIP strip CACHE FILEPATH "" FORCE)
685
682
# Set the architectures for which to build.
686
683
set (CMAKE_OSX_ARCHITECTURES ${ARCHS} CACHE INTERNAL "" )
687
684
# Change the type of target generated for try_compile() so it'll work when cross-compiling, weak compiler checks
0 commit comments