#IQRV #comment [Conan] 更新 scew/expat 的conan 引用版本

CMakeLists.txt

@@ -152,6 +152,7 @@ endif(CONAN_EXPORTED)
 
 
 include(conan)
+include(DependencyConanFiles)
 conan_cmake_run(REQUIRES RvcFramework/1.0.7-dev3@LR04.02_FrameworkLib/testing
 	Audio/2020.1230.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)

Module/mod_ThermalPrint/CMakeLists.txt

@@ -7,9 +7,6 @@ file(GLOB ${MODULE_PREFIX}_SRCS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
 set(MOD_VERSION_STRING "0.0.1-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
-conan_cmake_run(REQUIRES scew/1.1.7@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS)
-
 target_include_directories(${MODULE_NAME} PRIVATE
 	${DevHeadPath}
 	${CONAN_INCLUDE_DIRS_SCEW}

Module/mod_download/CMakeLists.txt

@@ -20,12 +20,6 @@ set(MOD_VERSION_STRING "1.0.0-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 #附加包含的目录
 
-conan_cmake_run(REQUIRES scew/1.1.7@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-
-
-
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_INCLUDE_DIRS_SCEW}

Module/mod_evtconverter/CMakeLists.txt

@@ -9,10 +9,6 @@ set(${MODULE_PREFIX}_SRCS
 set(MOD_VERSION_STRING "0.0.2-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
-conan_cmake_run(REQUIRES scew/1.1.7@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_SCEW}
 	${CONAN_INCLUDE_DIRS_EXPAT}

README.md

@@ -15,16 +15,18 @@
 
 * SCP 拷贝版本指定机器
 	* keba
-`scp -r /home/liaogf/run/version/0.0.3.1 keba@99.12.22.141:/opt/run/version`
+`scp -r /home/liaogf/Run/version/0.0.3.1 keba@99.12.22.141:/opt/run/version`
 	* gwi
-`scp -r /home/liaogf/run/version/0.0.3.1 gwi@99.12.22.142:/opt/run/version`
+`scp -r /home/liaogf/Run/version/0.0.3.1 gwi@99.12.22.142:/opt/run/version`
 	* grg
-`scp -r /home/liaogf/run/version/0.0.3.1 grg@99.12.22.143:/opt/run/version`
+`scp -r /home/liaogf/Run/version/0.0.3.1 grg@99.12.22.143:/opt/run/version`
 	* hengyin
-`scp -r /home/liaogf/run/version/0.0.3.1 vtm@99.12.22.144:/opt/run/version`
+`scp -r /home/liaogf/Run/version/0.0.3.1 vtm@99.12.22.144:/opt/run/version`
 	* nantian
-`scp -r /home/liaogf/run/version/0.0.3.1 uos@99.12.22.145:/opt/run/version`
+`scp -r /home/liaogf/Run/version/0.0.3.1 uos@99.12.22.145:/opt/run/version`
 
+	* kebao(杭州)
+`scp -r /home/liaogf/Run/version/0.0.3.1 keba@99.6.130.2:/opt/run/version`
 
 `scp -r /home/liaogf/run vtm@99.12.22.144:/opt/`
 

addin/cmake/DependencyConanFiles.cmake

@@ -0,0 +1,3 @@
+conan_cmake_run(REQUIRES expat/2.1.0@LR04.02_ThirdParty/testing 
+scew/1.1.7@LR04.02_ThirdParty/testing
+BASIC_SETUP CMAKE_TARGETS)