Merge branch 'develop' of http://mayun.itc.cmbchina.cn/QD_RemoteBankArea/LR04.02_RVCTerminalPlus into develop

Module/mod_chromium/CMakeLists.txt

@@ -55,12 +55,18 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 #¸½¼Ó°üº¬µÄĿ¼
 
 
-conan_cmake_run(boost/1.69.0@LR04.02_ThirdParty/testing
+conan_cmake_run(REQUIRES boost/1.69.0@LR04.02_ThirdParty/testing
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
 
-MESSAGE( STATUS "BOOST_ROOT = ${CONAN_INCLUDE_DIRS_BOOST}")
-set(BOOST_ROOT /home/pcacc/Desktop/boost_1_69_0)
+
+
+MESSAGE( STATUS "BOOST_ROOT = ${CONAN_BOOST_ROOT}")
+MESSAGE( STATUS "BOOST_INCLUDE_ROOT = ${CONAN_INCLUDE_DIRS_BOOST}")
+MESSAGE( STATUS "BOOST_LIBS_ROOT = ${CONAN_LIB_DIRS_BOOST}")
+#set(BOOST_ROOT /home/pcacc/Desktop/boost_1_69_0)
+set(BOOST_ROOT ${CONAN_BOOST_ROOT})
+
 set(Boost_DEBUG ON)
 set(Boost_USE_STATIC_LIBS   ON)
 if (OS_WINDOWS)