#IQRV #comment [DevAdapter] 资源文件放到 assets中

DevAdapter/CMakeLists.txt

@@ -95,8 +95,8 @@ set(DEVADAPTER_CURRENT_ASSET_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
 set(DEVADAPTER_CURRENT_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/${DIFF_PLATFORM_SUB_DIR}")
 set(DEVADAPTER_CURRENT_BIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bin/${DIFF_PLATFORM_SUB_DIR}")
 
-# 用于收录每一个厂商目录下 bin/*.dll 和 lib/*.so 文件
-set(RVC_VENDOR_DEP_LIB_DIRS ${DEVADAPTER_CURRENT_BIN_DIR})
+# 用于收录每一个厂商目录下 bin/*.dll 和 lib/*.so 文件，先收集当前目录下统一的库文件以及资源文件
+set(RVC_VENDOR_DEP_LIB_DIRS ${DEVADAPTER_CURRENT_BIN_DIR} ${DEVADAPTER_CURRENT_ASSET_DIR})
 if(NOT MSVC)
     set(RVC_VENDOR_DEP_LIB_DIRS ${RVC_VENDOR_DEP_LIB_DIRS} ${DEVADAPTER_CURRENT_LIB_DIR})
 endif(NOT MSVC)
@@ -104,11 +104,9 @@ endif(NOT MSVC)
 set(VENDOR_LOG_LIB_NAME log4vendor)
 if(NOT RVC_INTEGRATE_BUILD)
     set(VENDOR_LOG_LIB_NAME log4vendord)
-endif(NOT RVC_INTEGRATE_BUILD)
-
-if(RVC_INTEGRATE_BUILD)
+else()
     add_subdirectory(self)
-endif(RVC_INTEGRATE_BUILD)
+endif(NOT RVC_INTEGRATE_BUILD)
 
 message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}.")
 
@@ -117,10 +115,10 @@ foreach(dir ${all_valid_subdirs})
 	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
 		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
         string(COMPARE EQUAL ${dir_trimmed} "self" result)
-        if(RVC_INTEGRATE_BUILD AND NOT result)
-            message(STATUS "Adding vendor component ${dir_trimmed}")
+        if(NOT RVC_INTEGRATE_BUILD OR NOT result)
+		    message(STATUS "Adding vendor component ${dir_trimmed}")
 		    add_subdirectory(${dir_trimmed})
-        endif(RVC_INTEGRATE_BUILD AND NOT result)
+        endif(NOT RVC_INTEGRATE_BUILD OR NOT result)
 	endif()
 endforeach(dir)
 

DevAdapter/res/CMakeLists.txt

@@ -1,3 +0,0 @@
- file(GLOB DEVADAPTER_RESCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
-list(FILTER DEVADAPTER_RESCS EXCLUDE REGEX "CMakeLists\.txt")
-install(FILES ${DEVADAPTER_RESCS} DESTINATION "${RVC_VENDOR_PATH}" COMPONENT devadapters)