|
|
@@ -253,17 +253,17 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
|
|
|
# 通过conan的方式管理厂商库
|
|
|
if(DEVADAPTER_USING_CONAN)
|
|
|
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)
|
|
|
- set(GWI_CONAN_ALL_LIB_NAME gwi/2024.0312.04@LR04.02_VendorLib/msvc)
|
|
|
- set(KEBA_CONAN_ALL_LIB_NAME keba/2024.0326.23@LR04.02_VendorLib/msvc)
|
|
|
- set(SZZT_CONAN_ALL_LIB_NAME szzt/2024.0430.33@LR04.02_VendorLib/msvc)
|
|
|
- #rvc_aggerate_vendor_libs(cmb)
|
|
|
- rvc_aggerate_vendor_libs(szzt)
|
|
|
- rvc_aggerate_vendor_libs(gwi)
|
|
|
- rvc_aggerate_vendor_libs(keba)
|
|
|
- endif(RVC_INTEGRATE_BUILDV2)
|
|
|
+ if(RVC_INTEGRATE_BUILDV2)
|
|
|
+ #厂商适配器兼容WIN的提交，需要将以前的ZIP链接转化为Conan依赖包，处理完之后这里填写内容进行拉取：Demo
|
|
|
+ #set(CMB_CONAN_ALL_LIB_NAME cmb/2024.0315.20@LR04.02_VendorLib/msvc)
|
|
|
+ set(GWI_CONAN_ALL_LIB_NAME gwi/2024.0312.04@LR04.02_VendorLib/msvc)
|
|
|
+ set(KEBA_CONAN_ALL_LIB_NAME keba/2024.0326.23@LR04.02_VendorLib/msvc)
|
|
|
+ set(SZZT_CONAN_ALL_LIB_NAME szzt/2024.0430.33@LR04.02_VendorLib/msvc)
|
|
|
+ #rvc_aggerate_vendor_libs(cmb)
|
|
|
+ rvc_aggerate_vendor_libs(szzt)
|
|
|
+ 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)
|
|
|
@@ -329,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