|
|
@@ -243,10 +243,13 @@ if(NOT RVC_INTEGRATE_BUILD)
|
|
|
else()
|
|
|
# 使用工程源码编译
|
|
|
if(MSVC)
|
|
|
- set(SELF_CONAN_LIB_NAME self/2024.0311.01@LR04.02_VendorLib/testing)
|
|
|
+ conan_cmake_run(REQUIRES VendorDLL/7.3.0@LR04.02_VendorLib/msvc
|
|
|
+ BASIC_SETUP CMAKE_TARGETS)
|
|
|
+ set(SELF_CONAN_LIB_NAME self/2024.0313.01@LR04.02_VendorLib/testing)
|
|
|
+ add_subdirectory(self)
|
|
|
endif(MSVC)
|
|
|
set(VENDOR_LOG_LIB_NAME log4vendor)
|
|
|
- add_subdirectory(self)
|
|
|
+
|
|
|
endif(NOT RVC_INTEGRATE_BUILD)
|
|
|
message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
|
|
|
|
|
|
@@ -312,12 +315,16 @@ if(RVC_INTEGRATE_BUILD)
|
|
|
endif()
|
|
|
endforeach()
|
|
|
endforeach()
|
|
|
-
|
|
|
+ #安装VS2010下的厂商文件
|
|
|
+ if(CONAN_RES_DIRS_VENDORDLL)
|
|
|
+ file(GLOB RVC_DEP_BIN_FILES "${CONAN_RES_DIRS_VENDORDLL}/*")
|
|
|
+ install(FILES ${RVC_DEP_BIN_FILES} DESTINATION "${RVC_VENDOR_PATH}" COMPONENT devadapters)
|
|
|
+ endif(CONAN_RES_DIRS_VENDORDLL)
|
|
|
elseif(RVC_VENDOR_CONFIGV2)
|
|
|
# 此列表中的文件已在终端应用中包含，所以要移除，TODO: Windows 需要兼容
|
|
|
set(USELESS_DEVADAPTER_FILE_NAMES
|
|
|
- liblog4cplus.so
|
|
|
- libcmblog4vendor.so
|
|
|
+ liblog4cplus.so
|
|
|
+ libcmblog4vendor.so
|
|
|
)
|
|
|
list(REMOVE_DUPLICATES RVC_VENDOR_DEP_LIB_DIRS)
|
|
|
foreach(dep_dir ${RVC_VENDOR_DEP_LIB_DIRS})
|
80374374