From 36bffd01a5ed3362c90fce5a2307df6da9aef4b7 Mon Sep 17 00:00:00 2001 From: lvhan028 Date: Mon, 1 Aug 2022 16:25:24 +0800 Subject: [PATCH] rollback cmake.in and apis/python/CMakeLists.txt --- cmake/MMDeployConfig.cmake.in | 2 +- csrc/mmdeploy/apis/python/CMakeLists.txt | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/cmake/MMDeployConfig.cmake.in b/cmake/MMDeployConfig.cmake.in index 88804fa5d3..23e728f7ab 100644 --- a/cmake/MMDeployConfig.cmake.in +++ b/cmake/MMDeployConfig.cmake.in @@ -16,7 +16,7 @@ set(MMDEPLOY_VERSION_MAJOR @MMDEPLOY_VERSION_MAJOR@) set(MMDEPLOY_VERSION_MINOR @MMDEPLOY_VERSION_MINOR@) set(MMDEPLOY_VERSION_PATCH @MMDEPLOY_VERSION_PATCH@) -if (NOT MMDEPLOY_BUILD_SHARED AND NOT MMDEPLOY_BUILD_SDK_MONOLITHIC) +if (NOT MMDEPLOY_BUILD_SHARED) if ("cuda" IN_LIST MMDEPLOY_TARGET_DEVICES) find_package(CUDA REQUIRED) if(MSVC) diff --git a/csrc/mmdeploy/apis/python/CMakeLists.txt b/csrc/mmdeploy/apis/python/CMakeLists.txt index 02b92c0664..4c0fd31a15 100644 --- a/csrc/mmdeploy/apis/python/CMakeLists.txt +++ b/csrc/mmdeploy/apis/python/CMakeLists.txt @@ -21,14 +21,11 @@ endforeach () pybind11_add_module(${PROJECT_NAME} ${MMDEPLOY_PYTHON_SRCS}) -if (MMDEPLOY_BUILD_SDK_MONOLITHIC) - target_link_libraries(${PROJECT_NAME} PRIVATE mmdeploy) -else () - mmdeploy_load_static(${PROJECT_NAME} MMDeployStaticModules) - mmdeploy_load_dynamic(${PROJECT_NAME} MMDeployDynamicModules) - target_link_libraries(${PROJECT_NAME} PRIVATE MMDeployLibs) - - target_include_directories(${PROJECT_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_SOURCE_DIR}) -endif () + +mmdeploy_load_static(${PROJECT_NAME} MMDeployStaticModules) +mmdeploy_load_dynamic(${PROJECT_NAME} MMDeployDynamicModules) +target_link_libraries(${PROJECT_NAME} PRIVATE MMDeployLibs) + +target_include_directories(${PROJECT_NAME} PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_SOURCE_DIR})