🔧 严格区分本地源码和以 FetchContent 下载的 3rdparty，以设置不同的安装方式

cv-rmvl · Dec 5, 2024 · d2f2089 · d2f2089
1 parent e5d610e
commit d2f2089
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/3rdparty/apriltag/CMakeLists.txt b/3rdparty/apriltag/CMakeLists.txt
@@ -41,9 +41,3 @@ install(
   ARCHIVE DESTINATION ${RMVL_3P_LIB_INSTALL_PATH}
   OPTIONAL
 )
-
-if(UNIX)
-  set(apriltag_LIB "libapriltag.a" CACHE INTERNAL "name of the apriltag library")
-elseif(WIN32)
-  set(apriltag_LIB "apriltag.lib" CACHE INTERNAL "name of the apriltag library")
-endif()
diff --git a/3rdparty/open62541/CMakeLists.txt b/3rdparty/open62541/CMakeLists.txt
@@ -11,15 +11,4 @@ option(UA_ENABLE_PUBSUB "Enable the PubSub protocol" ON)
 rmvl_download(open62541 GIT "https://github.com/open62541/open62541.git : v1.3.8")
 set(open62541_VERSION "1.3.8" CACHE INTERNAL "open62541 version")
 
-install(
-  TARGETS open62541
-  EXPORT RMVLModules
-  ARCHIVE DESTINATION ${RMVL_3P_LIB_INSTALL_PATH}
-  OPTIONAL
-)
-
-if(UNIX)
-  set(open62541_LIB "libopen62541.a" CACHE INTERNAL "name of the open62541 library")
-elseif(WIN32)
-  set(open62541_LIB "open62541.lib" CACHE INTERNAL "name of the open62541 library")
-endif()
+_rmvl_set_target_in_3rd(open62541)
diff --git a/cmake/RMVLCompilerOptions.cmake b/cmake/RMVLCompilerOptions.cmake
@@ -232,6 +232,9 @@ endif()
 # ----------------------------------------------------------------------------
 #   3rdparty options
 # ----------------------------------------------------------------------------
+macro(_rmvl_set_target_in_3rd _name)
+  set(${_name}_IN_3RD ON CACHE INTERNAL "")
+endmacro()
 
 # opencv
 find_package(OpenCV QUIET)

diff --git a/cmake/RMVLGenConfig.cmake b/cmake/RMVLGenConfig.cmake
@@ -63,9 +63,13 @@ __find_imported_modules(optcamsdk OPTCameraSDK)
 __find_imported_modules(galaxysdk GalaxySDK)
 __find_imported_modules(optlc OPTLightCtrl)
 
-# 3rdparty libraries
-__find_imported_modules(apriltag apriltag)
-__find_imported_modules(open62541::open62541 open62541)
+# 3rdparty (local source code)
+# all targets have been configured in the corresponding CMakeLists.txt, no need to configure again
+
+# 3rdparty (download)
+if(open62541_IN_3RD)
+  list(APPEND RMVL_MODULES_3RD_DOWNLOAD_CONFIGCMAKE "include(\$\{RMVL_INSTALL_PATH\}/lib/cmake/open62541/open62541Config.cmake)\n")
+endif()
 
 # --------------------------------------------------------------------------------------------
 #  Part 2/3: Generate RMVLConfig.cmake

diff --git a/cmake/templates/RMVLConfig.cmake.in b/cmake/templates/RMVLConfig.cmake.in
@@ -71,6 +71,7 @@ unset(__d)
 # =============================================================
 # Get imported targets found in Module mode
 @RMVL_MODULES_IMPORTED_CONFIGCMAKE@
+# 3rdparty (download)
 if(WIN32)
   if(NOT TARGET opencv_world)
     add_library(opencv_world SHARED IMPORTED)
@@ -86,6 +87,7 @@ else()
   endif()
 endif()
 
+@RMVL_MODULES_3RD_DOWNLOAD_CONFIGCMAKE@
 # Export configuration
 if(NOT TARGET rmvl_core)
   include(${CMAKE_CURRENT_LIST_DIR}/RMVLModules.cmake)