File tree Expand file tree Collapse file tree 7 files changed +14
-13
lines changed Expand file tree Collapse file tree 7 files changed +14
-13
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,10 @@ if (NOT DEFINED CMAKE_INSTALL_PREFIX)
44endif ()
55message (STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX} " )
66
7+ if (NOT CMAKE_BUILD_TYPE )
8+ set (CMAKE_BUILD_TYPE Release CACHE STRING "choose 'Release' as default build type" FORCE)
9+ endif ()
10+
711cmake_minimum_required (VERSION 3.14)
812project (MMDeploy VERSION 1.1.0)
913
@@ -45,10 +49,6 @@ if ((NOT MMDEPLOY_BUILD_SDK_MONOLITHIC) AND MMDEPLOY_DYNAMIC_BACKEND)
4549 set (MMDEPLOY_DYNAMIC_BACKEND OFF )
4650endif ()
4751
48- if (NOT CMAKE_BUILD_TYPE )
49- set (CMAKE_BUILD_TYPE Release CACHE STRING "choose 'Release' as default build type" FORCE)
50- endif ()
51-
5252if (MMDEPLOY_SHARED_LIBS)
5353 set (MMDEPLOY_LIB_TYPE SHARED)
5454else ()
Original file line number Diff line number Diff line change @@ -4,7 +4,8 @@ project(mmdeploy_mmcls)
44
55file (GLOB_RECURSE SRCS ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp" )
66mmdeploy_add_module(${PROJECT_NAME} "${SRCS} " )
7- target_link_libraries (${PROJECT_NAME} PRIVATE opencv_core)
7+ target_link_libraries (${PROJECT_NAME}
8+ PRIVATE mmdeploy_opencv_utils)
89add_library (mmdeploy::mmcls ALIAS ${PROJECT_NAME} )
910
1011set (MMDEPLOY_TASKS ${MMDEPLOY_TASKS} classifier CACHE INTERNAL "" )
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ project(mmdeploy_mmdet)
55file (GLOB_RECURSE SRCS ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp" )
66mmdeploy_add_module(${PROJECT_NAME} "${SRCS} " )
77target_link_libraries (${PROJECT_NAME}
8- PRIVATE mmdeploy_opencv_utils)
8+ PRIVATE mmdeploy_opencv_utils mmdeploy_operation )
99
1010add_library (mmdeploy::mmdet ALIAS ${PROJECT_NAME} )
1111
Original file line number Diff line number Diff line change @@ -4,7 +4,8 @@ project(mmdeploy_mmedit)
44
55file (GLOB_RECURSE SRCS ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp" )
66mmdeploy_add_module(${PROJECT_NAME} "${SRCS} " )
7- target_link_libraries (${PROJECT_NAME} PRIVATE opencv_core)
7+ target_link_libraries (${PROJECT_NAME}
8+ PRIVATE mmdeploy_opencv_utils)
89add_library (mmdeploy::mmedit ALIAS ${PROJECT_NAME} )
910
1011set (MMDEPLOY_TASKS ${MMDEPLOY_TASKS} restorer CACHE INTERNAL "" )
Original file line number Diff line number Diff line change 22
33project (mmdeploy_mmpose)
44
5- find_package (OpenCV REQUIRED)
6-
75aux_source_directory (${CMAKE_CURRENT_SOURCE_DIR} MMPOSE_SRCS)
86aux_source_directory (${CMAKE_CURRENT_SOURCE_DIR} /pose_tracker POSE_TRACKER_SRCS)
97
108mmdeploy_add_module(${PROJECT_NAME} ${MMPOSE_SRCS} ${POSE_TRACKER_SRCS} )
119target_link_libraries (${PROJECT_NAME} PRIVATE
1210 mmdeploy::transform
1311 mmdeploy_operation
14- mmdeploy_opencv_utils
15- ${OpenCV_LIBS} )
12+ mmdeploy_opencv_utils)
1613target_include_directories (${PROJECT_NAME} PRIVATE
1714 ${CMAKE_CURRENT_SOURCE_DIR}
1815 ${CMAKE_CURRENT_SOURCE_DIR} /../../apis/c)
Original file line number Diff line number Diff line change @@ -88,7 +88,7 @@ export ANDROID_ABI=arm64-v8a
8888mkdir -p build\_${ANDROID_ABI}
8989cd build\_${ANDROID_ABI}
9090
91- cmake -DCMAKE_TOOLCHAIN_FILE=${NDK_PATH}/build/cmake/android.toolchain.cmake -DANDROID_ABI="${ANDROID_ABI}" -DANDROID_PLATFORM=android-30 -DNCNN_VULKAN=ON -DNCNN_DISABLE_EXCEPTION=OFF -DNCNN_DISABLE_RTTI=OFF ..
91+ cmake -DCMAKE_TOOLCHAIN_FILE=${NDK_PATH}/build/cmake/android.toolchain.cmake -DANDROID_ABI="${ANDROID_ABI}" -DANDROID_PLATFORM=android-30 -DNCNN_VULKAN=ON -DNCNN_DISABLE_EXCEPTION=OFF -DNCNN_DISABLE_RTTI=OFF -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False ..
9292make -j$(nproc) install
9393</code ></pre >
9494
@@ -123,6 +123,7 @@ MMDeploy provides a recipe as shown below for building SDK with ncnn as inferenc
123123 -DMMDEPLOY_TARGET_BACKENDS=ncnn \
124124 -DMMDEPLOY_SHARED_LIBS=OFF \
125125 -DCMAKE_TOOLCHAIN_FILE=${NDK_PATH} /build/cmake/android.toolchain.cmake \
126+ -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False \
126127 -DANDROID_ABI=${ANDROID_ABI} \
127128 -DANDROID_PLATFORM=android-30 \
128129 -DANDROID_CPP_FEATURES=" rtti exceptions"
Original file line number Diff line number Diff line change @@ -89,7 +89,7 @@ export ANDROID_ABI=arm64-v8a
8989mkdir -p build_${ANDROID_ABI}
9090cd build_${ANDROID_ABI}
9191
92- cmake -DCMAKE_TOOLCHAIN_FILE=${NDK_PATH}/build/cmake/android.toolchain.cmake -DANDROID_ABI="${ANDROID_ABI}" -DANDROID_PLATFORM=android-30 -DNCNN_VULKAN=ON -DNCNN_DISABLE_EXCEPTION=OFF -DNCNN_DISABLE_RTTI=OFF ..
92+ cmake -DCMAKE_TOOLCHAIN_FILE=${NDK_PATH}/build/cmake/android.toolchain.cmake -DANDROID_ABI="${ANDROID_ABI}" -DANDROID_PLATFORM=android-30 -DNCNN_VULKAN=ON -DNCNN_DISABLE_EXCEPTION=OFF -DNCNN_DISABLE_RTTI=OFF -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False ..
9393make -j$(nproc) install
9494</code ></pre >
9595
@@ -124,6 +124,7 @@ make -j$(nproc) install
124124 -DMMDEPLOY_TARGET_BACKENDS=ncnn \
125125 -DMMDEPLOY_SHARED_LIBS=OFF \
126126 -DCMAKE_TOOLCHAIN_FILE=${NDK_PATH} /build/cmake/android.toolchain.cmake \
127+ -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False \
127128 -DANDROID_ABI=${ANDROID_ABI} \
128129 -DANDROID_PLATFORM=android-30 \
129130 -DANDROID_CPP_FEATURES=" rtti exceptions"
You can’t perform that action at this time.
0 commit comments