File tree Expand file tree Collapse file tree 9 files changed +21
-8
lines changed Expand file tree Collapse file tree 9 files changed +21
-8
lines changed Original file line number Diff line number Diff line change @@ -156,7 +156,10 @@ if(ANDROID OR IOS)
156
156
endif ()
157
157
endif ()
158
158
159
- ##################################### Buiding: FastDeploy C++ SDK #######################################
159
+ # Check for macOS architecture
160
+ get_osx_architecture ()
161
+
162
+ ##################################### Building: FastDeploy C++ SDK #######################################
160
163
add_definitions (-DFASTDEPLOY_LIB )
161
164
# configure files before glob sources.
162
165
configure_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)
63
63
set (FASTTOKENIZER_FILE "fast_tokenizer-win-x86-${FASTTOKENIZER_VERSION} .zip" )
64
64
endif ()
65
65
elseif (APPLE )
66
- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
66
+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
67
67
set (FASTTOKENIZER_FILE "fast_tokenizer-osx-arm64-${FASTTOKENIZER_VERSION} .tgz" )
68
68
else ()
69
69
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)
70
70
set (FLYCV_FILE "flycv-win-x64-${FLYCV_VERSION} .zip" )
71
71
elseif (APPLE )
72
72
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" )
74
74
set (FLYCV_FILE "flycv-osx-arm64-${FLYCV_VERSION} .tgz" )
75
75
else ()
76
76
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)
54
54
set (ONNXRUNTIME_FILENAME "onnxruntime-win-x86-${ONNXRUNTIME_VERSION} .zip" )
55
55
endif ()
56
56
elseif (APPLE )
57
- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
57
+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
58
58
set (ONNXRUNTIME_FILENAME "onnxruntime-osx-arm64-${ONNXRUNTIME_VERSION} .tgz" )
59
59
else ()
60
60
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)
18
18
set (OPENCV_FILENAME "opencv-win-x64-3.4.16" )
19
19
set (COMPRESSED_SUFFIX ".zip" )
20
20
elseif (APPLE )
21
- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
21
+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
22
22
set (OPENCV_FILENAME "opencv-osx-arm64-3.4.16" )
23
23
else ()
24
24
set (OPENCV_FILENAME "opencv-osx-x86_64-3.4.16" )
Original file line number Diff line number Diff line change 32
32
message (FATAL_ERROR "FastDeploy cannot ENABLE_OPENVINO_BACKEND in win32 now." )
33
33
endif ()
34
34
elseif (APPLE )
35
- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
35
+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
36
36
message ("Cannot compile with openvino while in osx arm64 platform right now" )
37
37
else ()
38
38
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)
50
50
set (PADDLE2ONNX_FILE "paddle2onnx-win-x86-${PADDLE2ONNX_VERSION} .zip" )
51
51
endif ()
52
52
elseif (APPLE )
53
- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
53
+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
54
54
set (PADDLE2ONNX_FILE "paddle2onnx-osx-arm64-${PADDLE2ONNX_VERSION} .tgz" )
55
55
else ()
56
56
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)
56
56
set (PADDLEINFERENCE_FILE "paddle_inference-win-x64-${PADDLEINFERENCE_VERSION} .zip" )
57
57
endif ()
58
58
elseif (APPLE )
59
- if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64" )
59
+ if (CURRENT_OSX_ARCH MATCHES "arm64" )
60
60
message (FATAL_ERROR "Paddle Backend doesn't support Mac OSX with Arm64 now." )
61
61
set (PADDLEINFERENCE_FILE "paddle_inference-osx-arm64-${PADDLEINFERENCE_VERSION} .tgz" )
62
62
else ()
Original file line number Diff line number Diff line change @@ -63,3 +63,13 @@ function(get_windows_path win_path origin_path)
63
63
STRING (REGEX REPLACE "/" "\\\\ " _win_path ${origin_path} )
64
64
set (${win_path} ${_win_path} PARENT_SCOPE )
65
65
endfunction ()
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