|
|
@@ -153,7 +153,7 @@ endif(CONAN_EXPORTED)
|
|
|
|
|
|
include(conan)
|
|
|
conan_cmake_run(REQUIRES RvcFramework/1.0.7-dev1@LR04.02_FrameworkLib/testing
|
|
|
- Audio/2020.1230.01@LR04.02_MediaRes/testing
|
|
|
+ Audio/2020.1230.01@LR04.02_MediaRes/testing
|
|
|
BASIC_SETUP CMAKE_TARGETS)
|
|
|
|
|
|
set(RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS})
|
|
|
@@ -264,21 +264,20 @@ else(MSVC)
|
|
|
set(OUTPUT_CUR_DISK_PATH "${CURRENT_DISK}")
|
|
|
message(STATUS "OUTPUT_CUR_DISK_PATH: ${OUTPUT_CUR_DISK_PATH}")
|
|
|
endif(MSVC)
|
|
|
-set(OUTPUT_VERSION_DIR_PATH "${OUTPUT_CUR_DISK_PATH}run\\version")
|
|
|
-set(OUTPUT_CUR_VERSION_PATH "${OUTPUT_VERSION_DIR_PATH}\\${RVC_VERSION}")
|
|
|
|
|
|
+set(OUTPUT_VERSION_DIR_PATH "${OUTPUT_CUR_DISK_PATH}Run\\version")
|
|
|
+set(OUTPUT_CUR_VERSION_PATH "${OUTPUT_VERSION_DIR_PATH}\\${RVC_VERSION}")
|
|
|
if(NOT MSVC)
|
|
|
string(REPLACE "\\" "/" OUTPUT_VERSION_DIR_PATH ${OUTPUT_VERSION_DIR_PATH})
|
|
|
string(REPLACE "\\" "/" OUTPUT_CUR_VERSION_PATH ${OUTPUT_CUR_VERSION_PATH})
|
|
|
endif(NOT MSVC)
|
|
|
|
|
|
-
|
|
|
#Config install information
|
|
|
-set(PACK_INSTALL_RUN_DIR "run")
|
|
|
-set(PACK_INSTALL_RVC_DIR "rvc")
|
|
|
+set(PACK_INSTALL_RUN_DIR "Run")
|
|
|
+set(PACK_INSTALL_RVC_DIR "Data")
|
|
|
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(PACK_INSTALL_AD_DIR "${PACK_INSTALL_RVC_DIR}/Audio")
|
|
|
|
|
|
set(RVC_INCLUDE_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/include")
|
|
|
set(RVC_LIBRARY_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/lib")
|
|
|
@@ -447,8 +446,10 @@ if(MSVC)
|
|
|
endif()
|
|
|
else(MSVC)
|
|
|
if( NOT CPACK_GENERATOR)
|
|
|
- set(CPACK_GENERATOR "TGZ")
|
|
|
- message(STATUS "set tgz package file type")
|
|
|
+ set(CPACK_GENERATOR "ZIP")
|
|
|
+ message(STATUS "set zip package file type")
|
|
|
+ #set(CPACK_GENERATOR "TGZ")
|
|
|
+ #message(STATUS "set tgz package file type")
|
|
|
endif()
|
|
|
endif(MSVC)
|
|
|
|
|
|
@@ -499,7 +500,7 @@ install(FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}"
|
|
|
RENAME "root.ini"
|
|
|
COMPONENT scripts)
|
|
|
install(PROGRAMS ${BAT_SCRIPTS} DESTINATION "${PACK_INSTALL_PREFIX_VERSION}" COMPONENT scripts)
|
|
|
-
|
|
|
+install(FILES "${CMAKE_SOURCE_DIR}/addin/Run.ini" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
|
|
|
|
|
|
list(REMOVE_DUPLICATES RVC_CONAN_DEP_LIBS)
|
|
|
if(CONAN_LIB_DIRS_QT)
|
|
|
@@ -526,10 +527,9 @@ endforeach()
|
|
|
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)
|
|
|
+install(DIRECTORY "${CONAN_RES_DIRS_AUDIO}" DESTINATION "${PACK_INSTALL_RVC_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}/*")
|
|
|
foreach(item ${RVC_CHROMIUM_BIN_FILES})
|
|
|
if(IS_DIRECTORY ${item})
|
gifur