Răsfoiți Sursa

#IQRV #comment [CMake][Conan] 支持rvc/Audio的拷贝和打包

gifur 5 ani în urmă
părinte
comite
f913a661a3
2 a modificat fișierele cu 6 adăugiri și 1 ștergeri
  1. 5 0
      CMakeLists.txt
  2. 1 1
      ChangeLog

+ 5 - 0
CMakeLists.txt

@@ -153,6 +153,7 @@ endif(CONAN_EXPORTED)
 
 include(conan)
 conan_cmake_run(REQUIRES RvcFramework/1.0.6-dev6@LR04.02_FrameworkLib/testing
+ Audio/2020.1230.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
 
 set(RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS})
@@ -274,8 +275,10 @@ endif(NOT MSVC)
 
 #Config install information
 set(PACK_INSTALL_RUN_DIR "run")
+set(PACK_INSTALL_RVC_DIR "rvc")
 set(PACK_INSTALL_PREFIX_VERSION "${PACK_INSTALL_RUN_DIR}/version")
 set(PACK_INSTALL_PREFIX_CUR_VER "${PACK_INSTALL_PREFIX_VERSION}/${RVC_VERSION}")
+set(PACK_INSTALL_AD_DIR "${PACK_INSTALL_RVC_DIR}/addata")
 
 set(RVC_INCLUDE_PATH  "${PACK_INSTALL_PREFIX_CUR_VER}/include")
 set(RVC_LIBRARY_PATH   "${PACK_INSTALL_PREFIX_CUR_VER}/lib")
@@ -513,6 +516,8 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/res" DESTINATION "${PACK_INSTALL_PR
 file(GLOB RVC_RESOURCE_FILES LIST_DIRECTORIES FALSE "${CMAKE_SOURCE_DIR}/addin/assets/*")
 install(FILES ${RVC_RESOURCE_FILES} DESTINATION ${RVC_RUNTIME_PATH} COMPONENT resources)
 
+install(DIRECTORY "${CONAN_RES_DIRS_AUDIO}" DESTINATION "${PACK_INSTALL_AD_DIR}" COMPONENT resources)
+
 if(CEF_BIN_DIR)
 	message(STATUS "xxxx ${CEF_BIN_DIR}")
 	file(GLOB RVC_CHROMIUM_BIN_FILES LIST_DIRECTORIES true "${CEF_BIN_DIR}/*")

+ 1 - 1
ChangeLog

@@ -1,6 +1,6 @@
 ## 更新记录
 
-
+* 支持rvc/Audio的拷贝和打包(廖桂发,2020年12月30日)
 * 适应Jekins,添加WITH_CI_NUMBER宏标识(廖桂发,2020年12月22日)
 * 更新诗友给的CMPPrint.so(廖桂发,2020年12月11日)