|
|
@@ -269,7 +269,7 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
|
|
|
|
|
|
# 通过conan的方式管理厂商库
|
|
|
if(DEVADAPTER_USING_CONAN)
|
|
|
-if(MSVC)
|
|
|
+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)
|
|
|
@@ -279,12 +279,12 @@ if(MSVC)
|
|
|
rvc_aggerate_vendor_libs(gwi)
|
|
|
rvc_aggerate_vendor_libs(keba)
|
|
|
endif(RVC_INTEGRATE_BUILDV2)
|
|
|
-else()
|
|
|
+else() #UOS厂商适配器
|
|
|
if(RVC_INTEGRATE_BUILDV2)
|
|
|
set(KEBA_CONAN_ALL_LIB_NAME keba/2023.1222.22@LR04.02_VendorLib/stable)
|
|
|
set(CW_CONAN_ALL_LIB_NAME cw/2023.1226.14@LR04.02_VendorLib/stable)
|
|
|
set(SZZT_CONAN_ALL_LIB_NAME szzt/2023.1219.13@LR04.02_VendorLib/stable)
|
|
|
- set(GWI_CONAN_ALL_LIB_NAME gwi/2023.1128.10@LR04.02_VendorLib/stable)
|
|
|
+ set(GWI_CONAN_ALL_LIB_NAME gwi/2024.0125.14@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)
|
80374374