|
@@ -211,13 +211,13 @@ endmacro(rvc_dev_target_install)
|
|
|
# 用于收录厂商文件夹目录下 lib 下的 .so 库 或者 bin 下的 .dll 库 以及 资源文件
|
|
|
macro(rvc_aggereate_runtime_file)
|
|
|
if(RVC_INTEGRATE_BUILD)
|
|
|
- set(RVC_VENDOR_DEP_LIB_DIRS ${RVC_VENDOR_DEP_LIB_DIRS}
|
|
|
+ set(RVC_VENDOR_DEP_LIB_DIRS ${RVC_VENDOR_DEP_LIB_DIRS} ${RVC_VENDOR_LIB_DIRS}
|
|
|
${VENDOR_CURRENT_BIN_DIR} ${VENDOR_CURRENT_ASSET_DIR} PARENT_SCOPE)
|
|
|
if(NOT MSVC)
|
|
|
set(RVC_VENDOR_DEP_LIB_DIRS ${RVC_VENDOR_DEP_LIB_DIRS} ${VENDOR_CURRENT_LIB_DIR} PARENT_SCOPE)
|
|
|
endif(NOT MSVC)
|
|
|
elseif(RVC_VENDOR_CONFIGV2)
|
|
|
- set(RVC_VENDOR_DEP_LIB_DIRS ${RVC_VENDOR_DEP_LIB_DIRS}
|
|
|
+ set(RVC_VENDOR_DEP_LIB_DIRS ${RVC_VENDOR_DEP_LIB_DIRS} ${RVC_VENDOR_LIB_DIRS}
|
|
|
${VENDOR_CURRENT_BIN_DIR} ${VENDOR_CURRENT_ASSET_DIR} PARENT_SCOPE)
|
|
|
if(NOT MSVC)
|
|
|
set(RVC_VENDOR_DEP_LIB_DIRS ${RVC_VENDOR_DEP_LIB_DIRS} ${VENDOR_CURRENT_LIB_DIR} PARENT_SCOPE)
|
|
@@ -286,6 +286,7 @@ endforeach(dir)
|
|
|
|
|
|
if(RVC_INTEGRATE_BUILD)
|
|
|
list(REMOVE_DUPLICATES RVC_VENDOR_DEP_LIB_DIRS)
|
|
|
+ message(STATUS "dep_dirs:${RVC_VENDOR_DEP_LIB_DIRS}")
|
|
|
foreach(dep_dir ${RVC_VENDOR_DEP_LIB_DIRS})
|
|
|
message(STATUS "dep_dir: ${dep_dir}")
|
|
|
file(GLOB RVC_DEP_BIN_FILES "${dep_dir}/*")
|