Z991239-1017 #comment feat chromium中添加cefclient的上传和res的上传

CMakeLists.txt

@@ -271,6 +271,7 @@ set(RVC_MODULE_PATH  "${PACK_INSTALL_PREFIX_CUR_VER}/mod")
 set(RVC_CONFIG_PATH    "${PACK_INSTALL_PREFIX_CUR_VER}/cfg")
 set(RVC_VENDOR_PATH  "${PACK_INSTALL_PREFIX_CUR_VER}/dep")
 set(RVC_SHARED_PATH   "${PACK_INSTALL_PREFIX_CUR_VER}/share")
+set(RVC_CHROMIUM_PATH "${RVC_RUNTIME_PATH}/Chromium")
 
 
 set(CMAKE_INSTALL_INCLUDEDIR ${RVC_INCLUDE_PATH})
@@ -393,7 +394,6 @@ else()
 	message(STATUS "RVC_PDB_BINARY_DIR: ${RVC_PDB_BINARY_DIR}")
 
 endif(SIMULATE_ON)#end simulate
-
 add_subdirectory(Other)
 add_subdirectory(Module)
 if(BUILD_DEVADAPTER)
@@ -497,6 +497,18 @@ foreach(bin_dir ${RVC_CONAN_DEP_LIBS})
 endforeach()
 install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/res" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}" COMPONENT scripts )
 
+if(CEF_BIN_DIR)
+	message(STATUS "xxxx ${CEF_BIN_DIR}")
+	file(GLOB RVC_CHROMIUM_BIN_FILES LIST_DIRECTORIES true "${CEF_BIN_DIR}/*")
+	foreach(item ${RVC_CHROMIUM_BIN_FILES})
+		if(IS_DIRECTORY ${item})
+			install(DIRECTORY "${item}" DESTINATION "${RVC_CHROMIUM_PATH}" COMPONENT libraries )
+		else()
+			install(FILES ${item} DESTINATION "${RVC_CHROMIUM_PATH}" COMPONENT libraries)
+		endif()
+	endforeach()
+endif(CEF_BIN_DIR)
+
 #appoint the component to install , except header file here.
  #set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE TRUE)

Module/CMakeLists.txt

@@ -161,9 +161,14 @@ add_subdirectory(mod_watchdog)
 add_subdirectory(mod_interactivelog)
 add_subdirectory(mod_healthmanager)
 add_subdirectory(mod_chromium)
+add_subdirectory(mod_validityVertifier)
+add_subdirectory(mod_tokenmgr)
 # 汇总要依赖拷贝的第三方库
 set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${MODULE_CONAN_DEP_LIBS} PARENT_SCOPE)
 
+if(TEST_CHROMIMU_DIR)
+    set (CEF_BIN_DIR ${TEST_CHROMIMU_DIR} PARENT_SCOPE)
+endif()
 
 
 

Module/mod_chromium/CMakeLists.txt

@@ -54,16 +54,20 @@ set(MOD_VERSION_STRING "1.0.0-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 #附加包含的目录
 
-
-conan_cmake_run(REQUIRES boost/1.69.0@LR04.02_ThirdParty/testing
+#need cefclient
+conan_cmake_run(REQUIRES cefclient/1.0@LR04.02_ThirdParty/testing
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
 
+set (TEST_CHROMIMU_DIR ${CONAN_CEFCLIENT_ROOT}/bin PARENT_SCOPE)
 
 
+#need boost
+conan_cmake_run(REQUIRES boost/1.69.0@LR04.02_ThirdParty/testing
+BASIC_SETUP CMAKE_TARGETS
+BUILD missing)
+
 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})
 
@@ -81,13 +85,13 @@ find_package(Boost COMPONENTS atomic chrono date_time filesystem regex system th
 
 if(Boost_FOUND)
 	include_directories(${Boost_INCLUDE_DIRS})
-
 	MESSAGE( STATUS "Boost_INCLUDE_DIRS = ${Boost_INCLUDE_DIRS}")
 	MESSAGE( STATUS "Boost_LIBRARIES = ${Boost_LIBRARIES}")
 	MESSAGE( STATUS "Boost_LIB_VERSION = ${Boost_LIB_VERSION}")
-
 endif()
 
+#boost end
+
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
@@ -110,4 +114,4 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${Boost_LIBRARIES}
 deploy_module(${MODULE_PREFIX} ${MODULE_NAME})
 
 # 设置要依赖拷贝的第三方库
-set(MODULE_CONAN_DEP_LIBS ${MODULE_CONAN_DEP_LIBS} ${CONAN_BIN_DIRS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
+# set(MODULE_CONAN_DEP_LIBS ${MODULE_CONAN_DEP_LIBS} ${CONAN_BIN_DIRS} ${CONAN_LIB_DIRS} PARENT_SCOPE)