File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -156,7 +156,10 @@ if(ANDROID OR IOS)
156156 endif ()
157157endif ()
158158
159- ##################################### Buiding: FastDeploy C++ SDK #######################################
159+ # Check for macOS architecture
160+ get_osx_architecture ()
161+
162+ ##################################### Building: FastDeploy C++ SDK #######################################
160163add_definitions (-DFASTDEPLOY_LIB )
161164# configure files before glob sources.
162165configure_file (${PROJECT_SOURCE_DIR} /${CSRCS_DIR_NAME}/fastdeploy/core/config.h.in ${PROJECT_SOURCE_DIR} /${CSRCS_DIR_NAME}/fastdeploy/core/config.h )
Original file line number Diff line number Diff line change @@ -63,7 +63,7 @@ if(WIN32)
6363 set (FASTTOKENIZER_FILE "fast_tokenizer-win-x86-${FASTTOKENIZER_VERSION} .zip" )
6464 endif ()
6565elseif (APPLE )
66- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
66+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
6767 set (FASTTOKENIZER_FILE "fast_tokenizer-osx-arm64-${FASTTOKENIZER_VERSION} .tgz" )
6868 else ()
6969 set (FASTTOKENIZER_FILE "fast_tokenizer-osx-x86_64-${FASTTOKENIZER_VERSION} .tgz" )
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ if(WIN32)
7070 set (FLYCV_FILE "flycv-win-x64-${FLYCV_VERSION} .zip" )
7171elseif (APPLE )
7272 message (FATAL_ERROR "FlyCV is not supported on Mac OSX now." )
73- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
73+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
7474 set (FLYCV_FILE "flycv-osx-arm64-${FLYCV_VERSION} .tgz" )
7575 else ()
7676 set (FLYCV_FILE "flycv-osx-x86_64-${FLYCV_VERSION} .tgz" )
Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ if(WIN32)
5454 set (ONNXRUNTIME_FILENAME "onnxruntime-win-x86-${ONNXRUNTIME_VERSION} .zip" )
5555 endif ()
5656elseif (APPLE )
57- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
57+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
5858 set (ONNXRUNTIME_FILENAME "onnxruntime-osx-arm64-${ONNXRUNTIME_VERSION} .tgz" )
5959 else ()
6060 set (ONNXRUNTIME_FILENAME "onnxruntime-osx-x86_64-${ONNXRUNTIME_VERSION} .tgz" )
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ if(WIN32)
1818 set (OPENCV_FILENAME "opencv-win-x64-3.4.16" )
1919 set (COMPRESSED_SUFFIX ".zip" )
2020elseif (APPLE )
21- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
21+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
2222 set (OPENCV_FILENAME "opencv-osx-arm64-3.4.16" )
2323 else ()
2424 set (OPENCV_FILENAME "opencv-osx-x86_64-3.4.16" )
Original file line number Diff line number Diff line change 3232 message (FATAL_ERROR "FastDeploy cannot ENABLE_OPENVINO_BACKEND in win32 now." )
3333 endif ()
3434 elseif (APPLE )
35- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
35+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
3636 message ("Cannot compile with openvino while in osx arm64 platform right now" )
3737 else ()
3838 set (OPENVINO_FILENAME "m_openvino_toolkit_osx_${OPENVINO_VERSION} " )
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ if(WIN32)
5050 set (PADDLE2ONNX_FILE "paddle2onnx-win-x86-${PADDLE2ONNX_VERSION} .zip" )
5151 endif ()
5252elseif (APPLE )
53- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
53+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
5454 set (PADDLE2ONNX_FILE "paddle2onnx-osx-arm64-${PADDLE2ONNX_VERSION} .tgz" )
5555 else ()
5656 set (PADDLE2ONNX_FILE "paddle2onnx-osx-x86_64-${PADDLE2ONNX_VERSION} .tgz" )
Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ if(WIN32)
5656 set (PADDLEINFERENCE_FILE "paddle_inference-win-x64-${PADDLEINFERENCE_VERSION} .zip" )
5757 endif ()
5858elseif (APPLE )
59- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
59+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
6060 message (FATAL_ERROR "Paddle Backend doesn't support Mac OSX with Arm64 now." )
6161 set (PADDLEINFERENCE_FILE "paddle_inference-osx-arm64-${PADDLEINFERENCE_VERSION} .tgz" )
6262 else ()
Original file line number Diff line number Diff line change @@ -63,3 +63,13 @@ function(get_windows_path win_path origin_path)
6363 STRING (REGEX REPLACE "/" "\\\\ " _win_path ${origin_path} )
6464 set (${win_path} ${_win_path} PARENT_SCOPE )
6565endfunction ()
66+
67+ function (get_osx_architecture )
68+ if (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64" )
69+ set (CURRENT_OSX_ARCH "arm64" PARENT_SCOPE )
70+ elseif (CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64" )
71+ set (CURRENT_OSX_ARCH "x86_64" PARENT_SCOPE )
72+ else ()
73+ set (CURRENT_OSX_ARCH ${CMAKE_HOST_SYSTEM_PROCESSOR} PARENT_SCOPE )
74+ endif ()
75+ endfunction ()
You can’t perform that action at this time.
0 commit comments