rollback cmake.in and apis/python/CMakeLists.txt

open-mmlab · Aug 1, 2022 · 36bffd0 · 36bffd0
1 parent 26ef01b
commit 36bffd0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git 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
@@ -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})