improve arch detection on apple

skyline75489 · Sep 25, 2024 · e9e2c25 · e9e2c25
1 parent d32bbe5
commit e9e2c25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cmake/global_variables.cmake b/cmake/global_variables.cmake
@@ -39,7 +39,7 @@ if(WIN32)
   set(ONNXRUNTIME_PROVIDERS_CUDA_LIB "onnxruntime_providers_cuda.dll")
   set(ONNXRUNTIME_PROVIDERS_ROCM_LIB "onnxruntime_providers_rocm.dll")
 elseif(APPLE)
-  if(BUILD_APPLE_FRAMEWORK)
+  if(IOS OR MAC_CATALYST)
     add_library(onnxruntime IMPORTED STATIC)
     if(PLATFORM_NAME STREQUAL "macabi")
       # The xcframework in cmake doesn't seem to support MacCatalyst.
@@ -70,7 +70,7 @@ file(GLOB generator_srcs CONFIGURE_DEPENDS
 
 set(ortgenai_embed_libs "") # shared libs that will be embedded inside the onnxruntime-genai package
 
-if (BUILD_APPLE_FRAMEWORK)
+if (IOS OR MAC_CATALYST)
   if (NOT EXISTS "${ORT_LIB_DIR}/onnxruntime.xcframework")
     message(FATAL_ERROR "Expected the ONNX Runtime XCFramework to be found at ${ORT_LIB_DIR}/onnxruntime.xcframework. Actual: Not found.")
   endif()

diff --git a/cmake/ortlib.cmake b/cmake/ortlib.cmake
@@ -61,7 +61,9 @@ else()
   else()
     set(ORT_BINARY_PLATFORM "x64")
     if (APPLE)
-      if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+      if(IOS)
+        set(ORT_BINARY_PLATFORM ${IOS_ARCH})
+      elseif(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
         set(ORT_BINARY_PLATFORM "arm64")
       endif()
       set(ORT_LIB_DIR ${ortlib_SOURCE_DIR}/runtimes/osx-${ORT_BINARY_PLATFORM}/native)