|
|
@@ -255,7 +255,13 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
|
|
|
|
|
|
# 通过conan的方式管理厂商库
|
|
|
if(DEVADAPTER_USING_CONAN)
|
|
|
-if(NOT MSVC)
|
|
|
+if(MSVC)
|
|
|
+ if(RVC_INTEGRATE_BUILDV2)
|
|
|
+ #厂商适配器兼容WIN的提交，需要将以前的ZIP链接转化为Conan依赖包，处理完之后这里填写内容进行拉取：Demo
|
|
|
+ #set(CMB_CONAN_ALL_LIB_NAME cmb/2024.0315.20@LR04.02_VendorLib/msvc)
|
|
|
+ #rvc_aggerate_vendor_libs(cmb)
|
|
|
+ endif(RVC_INTEGRATE_BUILDV2)
|
|
|
+else()
|
|
|
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)
|
|
|
@@ -270,7 +276,7 @@ if(NOT MSVC)
|
|
|
rvc_aggerate_vendor_libs(nantian)
|
|
|
rvc_aggerate_vendor_libs(grg)
|
|
|
endif(RVC_INTEGRATE_BUILDV2)
|
|
|
-endif(NOT MSVC)
|
|
|
+endif(MSVC)
|
|
|
endif(DEVADAPTER_USING_CONAN)
|
|
|
|
|
|
file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
|
80374374