|
|
@@ -245,13 +245,6 @@ if(NOT RVC_INTEGRATE_BUILD)
|
|
|
set(VENDOR_LOG_LIB_NAME ${VENDOR_LOG_LIBRARY_NAME})
|
|
|
else()
|
|
|
# 使用工程源码编译
|
|
|
- if(MSVC)
|
|
|
- #合入目前全量包中的DEP文件内容
|
|
|
- conan_cmake_run(REQUIRES VendorDLL/7.6.0@LR04.02_VendorLib/testing
|
|
|
- BASIC_SETUP CMAKE_TARGETS)
|
|
|
- set(SELF_CONAN_LIB_NAME self/2024.0412.01@LR04.02_VendorLib/testing)
|
|
|
- add_subdirectory(self)
|
|
|
- endif(MSVC)
|
|
|
set(VENDOR_LOG_LIB_NAME log4vendor)
|
|
|
|
|
|
endif(NOT RVC_INTEGRATE_BUILD)
|
|
|
@@ -259,7 +252,7 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
|
|
|
|
|
|
# 通过conan的方式管理厂商库
|
|
|
if(DEVADAPTER_USING_CONAN)
|
|
|
-if(MSVC) #Windows 厂商适配器
|
|
|
+ if(MSVC) #Windows 厂商适配器
|
|
|
if(RVC_INTEGRATE_BUILDV2)
|
|
|
#厂商适配器兼容WIN的提交，需要将以前的ZIP链接转化为Conan依赖包，处理完之后这里填写内容进行拉取：Demo
|
|
|
#set(CMB_CONAN_ALL_LIB_NAME cmb/2024.0315.20@LR04.02_VendorLib/msvc)
|
|
|
@@ -271,22 +264,31 @@ if(MSVC) #Windows 厂商适配器
|
|
|
rvc_aggerate_vendor_libs(gwi)
|
|
|
rvc_aggerate_vendor_libs(keba)
|
|
|
endif(RVC_INTEGRATE_BUILDV2)
|
|
|
-else() #UOS厂商适配器
|
|
|
- if(RVC_INTEGRATE_BUILDV2)
|
|
|
- set(KEBA_CONAN_ALL_LIB_NAME keba/2024.0119.25@LR04.02_VendorLib/stable)
|
|
|
- set(CW_CONAN_ALL_LIB_NAME cw/2024.0325.25@LR04.02_VendorLib/stable)
|
|
|
- set(SZZT_CONAN_ALL_LIB_NAME szzt/2024.0508.25@LR04.02_VendorLib/stable)
|
|
|
- set(GWI_CONAN_ALL_LIB_NAME gwi/2024.0407.15@LR04.02_VendorLib/stable)
|
|
|
- set(NANTIAN_CONAN_ALL_LIB_NAME nantian/2023.1206.1@LR04.02_VendorLib/stable)
|
|
|
- set(GRG_CONAN_ALL_LIB_NAME grg/2023.1213.24@LR04.02_VendorLib/stable)
|
|
|
- rvc_aggerate_vendor_libs(keba)
|
|
|
- rvc_aggerate_vendor_libs(cw)
|
|
|
- rvc_aggerate_vendor_libs(szzt)
|
|
|
- rvc_aggerate_vendor_libs(gwi)
|
|
|
- rvc_aggerate_vendor_libs(nantian)
|
|
|
- rvc_aggerate_vendor_libs(grg)
|
|
|
- endif(RVC_INTEGRATE_BUILDV2)
|
|
|
-endif(MSVC)
|
|
|
+ else() #UOS厂商适配器
|
|
|
+ if(RVC_INTEGRATE_BUILDV2)
|
|
|
+ set(KEBA_CONAN_ALL_LIB_NAME keba/2024.0119.25@LR04.02_VendorLib/stable)
|
|
|
+ set(CW_CONAN_ALL_LIB_NAME cw/2024.0325.25@LR04.02_VendorLib/stable)
|
|
|
+ set(SZZT_CONAN_ALL_LIB_NAME szzt/2024.0508.25@LR04.02_VendorLib/stable)
|
|
|
+ set(GWI_CONAN_ALL_LIB_NAME gwi/2024.0407.15@LR04.02_VendorLib/stable)
|
|
|
+ set(NANTIAN_CONAN_ALL_LIB_NAME nantian/2023.1206.1@LR04.02_VendorLib/stable)
|
|
|
+ set(GRG_CONAN_ALL_LIB_NAME grg/2023.1213.24@LR04.02_VendorLib/stable)
|
|
|
+ rvc_aggerate_vendor_libs(keba)
|
|
|
+ rvc_aggerate_vendor_libs(cw)
|
|
|
+ rvc_aggerate_vendor_libs(szzt)
|
|
|
+ rvc_aggerate_vendor_libs(gwi)
|
|
|
+ rvc_aggerate_vendor_libs(nantian)
|
|
|
+ rvc_aggerate_vendor_libs(grg)
|
|
|
+ endif(RVC_INTEGRATE_BUILDV2)
|
|
|
+ endif(MSVC)
|
|
|
+
|
|
|
+ if(MSVC)
|
|
|
+ #合入目前全量包中的DEP文件内容
|
|
|
+ conan_cmake_run(REQUIRES VendorDLL/7.6.0@LR04.02_VendorLib/msvc
|
|
|
+ BASIC_SETUP CMAKE_TARGETS)
|
|
|
+ set(SELF_CONAN_LIB_NAME self/2024.0607.01@LR04.02_VendorLib/testing)
|
|
|
+ add_subdirectory(self)
|
|
|
+ endif(MSVC)
|
|
|
+
|
|
|
endif(DEVADAPTER_USING_CONAN)
|
|
|
|
|
|
file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
|
|
|
@@ -327,6 +329,8 @@ if(RVC_INTEGRATE_BUILD)
|
|
|
list(REMOVE_DUPLICATES RVC_DEP_BIN_FILES)
|
|
|
message(STATUS "before file: ${RVC_DEP_BIN_FILES}")
|
|
|
list(FILTER RVC_DEP_BIN_FILES EXCLUDE REGEX ".*\\.a$")
|
|
|
+ list(FILTER RVC_DEP_BIN_FILES EXCLUDE REGEX ".*\\liblog4cplus.so$")
|
|
|
+ list(FILTER RVC_DEP_BIN_FILES EXCLUDE REGEX ".*\\libcmblog4vendor.so$")
|
|
|
message(STATUS "after file: ${RVC_DEP_BIN_FILES}")
|
|
|
foreach(bin_file ${RVC_DEP_BIN_FILES})
|
|
|
if(IS_DIRECTORY ${bin_file})
|
80374374