#IQWV #comment [Conan][CMake] 添加Conan库存放无源码的非外部厂商的库

CMakeLists.txt

@@ -499,6 +499,7 @@ foreach(bin_dir ${RVC_CONAN_DEP_LIBS})
 	# file(GLOB RVC_CONAN_BIN_FILES  LIST_DIRECTORIES false "${bin_dir}/*.so" "${bin_dir}/*.dll")
 	file(GLOB RVC_CONAN_BIN_FILES LIST_DIRECTORIES false "${bin_dir}/*")
 	list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*\.a$")
+	list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*\.lib$")
 	# list(FILTER RVC_CONAN_BIN_FILES EXCLUDE REGEX ".*libQt5Charts.so*")
 	install(PROGRAMS ${RVC_CONAN_BIN_FILES} DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries)
 endforeach()

ChangeLog

@@ -1,4 +1,8 @@
 ## 更新记录
+
+* 所有要迁移改造的实体均添加到Module/CMakeLists.txt中，没达到100%的已注释（廖桂发，2020年12月2日）
+* 实体依赖无源码非外部厂商的共享库已经打包在`Misc/YYYY.MMDD.TT@LR04.02_ModuleDep/UOS`，新增需按照规则提交（廖桂发，2020年12月2日）
+
 * 添加 DevAdapter/res 文件夹，用于放置dep下的资源文件，如身份证的背景照片，该目录下的文件均会拷贝到dep下（廖桂发，2020年12月1日）
 * 添加5家厂商的测试 root.ini  文件并改动顶层CMakeLists.txt（廖桂发，2020年11月26日）
 * [cmake] 添加 PrecompiledHeader.cmake 用于 Windows 下预编译头文件（陈礼鹏，2020年11月14日）

Module/CMakeLists.txt

@@ -140,7 +140,15 @@ if(BUILD_MOUDLE_TEST)
     message(STATUS "build module test case")
 endif(BUILD_MOUDLE_TEST)
 
-set(MODULE_CONAN_DEP_LIBS)
+if(MSVC)
+    conan_cmake_run(REQUIRES Misc/2020.1202.1@LR04.02_ModuleDep/Windows
+    BASIC_SETUP CMAKE_TARGETS)
+    set(MODULE_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_MISC})
+else()
+    conan_cmake_run(REQUIRES Misc/2020.1202.1@LR04.02_ModuleDep/UOS
+    BASIC_SETUP CMAKE_TARGETS)
+    set(MODULE_CONAN_DEP_LIBS ${CONAN_BIN_DIRS_MISC} ${CONAN_LIB_DIRS_MISC} )
+endif(MSVC)
 
 # 遍历实体
 # rvc_add_all_cmake_subdirectory()
@@ -148,14 +156,16 @@ add_subdirectory(mod_validityVertifier)
 add_subdirectory(mod_deviceswitch)
 add_subdirectory(mod_CardReadAdapter)
 add_subdirectory(mod_cardissuer)
-add_subdirectory(mod_ContactlessCard)
 add_subdirectory(mod_pinpad)
-#add_subdirectory(mod_IDCertificate)
+add_subdirectory(mod_IDCertificate)
 add_subdirectory(mod_CustMngrAuth)
 add_subdirectory(mod_FingerPrint)
 add_subdirectory(mod_customeraware)
+add_subdirectory(mod_localmediaplay)
 add_subdirectory(mod_interactivecontrol)
 add_subdirectory(mod_assistantchannel)
+#add_subdirectory(mod_UpgradeMgr)
+add_subdirectory(mod_UpgradeRun)
 add_subdirectory(mod_upload)
 add_subdirectory(mod_download)
 add_subdirectory(mod_healthmanager)
@@ -167,16 +177,42 @@ add_subdirectory(mod_tokenmgr)
 add_subdirectory(mod_evtconverter)
 add_subdirectory(mod_interactivelog)
 add_subdirectory(mod_chromium)
-add_subdirectory(mod_watchdog)
-add_subdirectory(mod_counterconnector)
-add_subdirectory(mod_localmediaplay)
-add_subdirectory(mod_mediacontroller)
 
+add_subdirectory(mod_ups)
 add_subdirectory(mod_ScannerSet)
 add_subdirectory(mod_HSPScanner)
-
+add_subdirectory(mod_ContactlessCard)
+#add_subdirectory(mod_gpio)
+add_subdirectory(mod_watchdog)
 add_subdirectory(mod_DeviceControl)
-add_subdirectory(mod_ups)
+#add_subdirectory(mod_ThermalPrint)
+#add_subdirectory(mod_facetracking)
+#add_subdirectory(mod_initiativetransfer)
+#add_subdirectory(mod_interactioncontext)
+#add_subdirectory(mod_interactivecontrol)
+add_subdirectory(mod_counterconnector)
+#add_subdirectory(mod_countercontext)
+#add_subdirectory(mod_mediacontroller)
+#add_subdirectory(mod_recorder)
+#add_subdirectory(mod_snapshot)
+#add_subdirectory(mod_screenshot)
+#add_subdirectory(mod_selfchecker)
+#add_subdirectory(mod_uplog)
+#add_subdirectory(mod_heartbeat)
+#add_subdirectory(mod_alarm)
+#add_subdirectory(mod_RomoteController)
+#add_subdirectory(mod_ResourceWatcher)
+#add_subdirectory(mod_livenessdetection)
+#add_subdirectory(mod_SalesRecorder)
+
+
+
+
+
+
+
+
+
 
 # 汇总要依赖拷贝的第三方库
 set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${MODULE_CONAN_DEP_LIBS} PARENT_SCOPE)