Browse Source

Z991239-1117 #comment feature: 厂商日志库支持lib下的文件夹拷贝

gifur 4 years ago
parent
commit
3c6db51f2f
2 changed files with 9 additions and 2 deletions
  1. 8 1
      DevAdapter/CMakeLists.txt
  2. 1 1
      Other/CMakeLists.txt

+ 8 - 1
DevAdapter/CMakeLists.txt

@@ -129,9 +129,16 @@ if(RVC_INTEGRATE_BUILD)
     foreach(dep_dir ${RVC_VENDOR_DEP_LIB_DIRS})
 	    message(STATUS "dep_dir: ${dep_dir}")
 	    file(GLOB RVC_DEP_BIN_FILES "${dep_dir}/*")
+        list(REMOVE_DUPLICATES RVC_DEP_BIN_FILES)
         message(STATUS "before file: ${RVC_DEP_BIN_FILES}")
         list(FILTER RVC_DEP_BIN_FILES EXCLUDE REGEX ".*\.a$")
         message(STATUS "after file: ${RVC_DEP_BIN_FILES}")
-	    install(PROGRAMS ${RVC_DEP_BIN_FILES} DESTINATION "${RVC_VENDOR_PATH}" COMPONENT devadapters)
+        foreach(bin_file ${RVC_DEP_BIN_FILES})
+            if(IS_DIRECTORY ${bin_file})
+                install(DIRECTORY "${bin_file}" DESTINATION "${RVC_VENDOR_PATH}" COMPONENT devadapters)
+            else()
+                install(PROGRAMS ${bin_file} DESTINATION "${RVC_VENDOR_PATH}" COMPONENT devadapters)
+            endif()
+        endforeach()
     endforeach()
 endif(RVC_INTEGRATE_BUILD)

+ 1 - 1
Other/CMakeLists.txt

@@ -2,7 +2,7 @@ if(SIMULATE_ON)
 	rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_RUNTIME_PATH}")
 endif(SIMULATE_ON)
 
-#add_subdirectory(libimageproc)
+add_subdirectory(libimageproc)
 add_subdirectory(libpublicFun)
 
 # rvc_add_all_cmake_subdirectory()