|
|
@@ -284,7 +284,7 @@ if(CONAN_CACHE_CLEAR)
|
|
|
conan_local_remove()
|
|
|
endif(CONAN_CACHE_CLEAR)
|
|
|
|
|
|
-conan_cmake_run(REQUIRES RvcFramework/1.2.0.43@LR04.02_FrameworkLib/dev
|
|
|
+conan_cmake_run(REQUIRES RvcFramework/1.2.0.45@LR04.02_FrameworkLib/dev
|
|
|
Audio/2023.0509.01@LR04.02_MediaRes/testing
|
|
|
BASIC_SETUP CMAKE_TARGETS)
|
|
|
include(DependencyConanFiles)
|
|
|
@@ -548,7 +548,6 @@ message("Generated env.ini file in ${CMAKE_BINARY_DIR}")
|
|
|
|
|
|
# Configure files
|
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.in" ${CMAKE_BINARY_DIR}/ChangeLog @ONLY)
|
|
|
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/addin/cfg/shell.ini.in" ${CMAKE_BINARY_DIR}/shell.ini @ONLY)
|
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/addin/Run.ini.in" "${CMAKE_BINARY_DIR}/Run.ini" @ONLY NEWLINE_STYLE CRLF)
|
|
|
|
|
|
if(SIMULATE_ON)
|
|
|
@@ -671,7 +670,6 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/cfg" DESTINATION "${PACK_INSTALL_PR
|
|
|
COMPONENT scripts FILES_MATCHING PATTERN "*.ini")
|
|
|
install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/cfg" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}"
|
|
|
COMPONENT scripts FILES_MATCHING PATTERN "*.xml")
|
|
|
-install(FILES ${CMAKE_BINARY_DIR}/shell.ini DESTINATION ${RVC_CONFIG_PATH} COMPONENT scripts)
|
|
|
install(FILES ${CMAKE_BINARY_DIR}/env.ini DESTINATION ${RVC_CONFIG_PATH} COMPONENT scripts)
|
|
|
|
|
|
set(active_txt_file "${CMAKE_BINARY_DIR}/active.txt")
|
陈良瑜80374463