|
|
@@ -53,7 +53,6 @@ else()
|
|
|
endif()
|
|
|
|
|
|
set(DEVOPS_ON FALSE)
|
|
|
-set(FORMAT_UPDATE_PKG FALSE)
|
|
|
set(FORMAT_WITH_SUFFIX TRUE)
|
|
|
set(DEVOPS_ON_CMAKE_ST FALSE)
|
|
|
set(DEVOPS_ON_CMAKE_UAT FALSE)
|
|
|
@@ -274,7 +273,7 @@ if(CONAN_CACHE_CLEAR)
|
|
|
conan_local_remove()
|
|
|
endif(CONAN_CACHE_CLEAR)
|
|
|
|
|
|
-conan_cmake_run(REQUIRES RvcFramework/1.0.8-dev13@LR04.02_FrameworkLib/testing
|
|
|
+conan_cmake_run(REQUIRES RvcFramework/1.0.8-dev14@LR04.02_FrameworkLib/testing
|
|
|
Audio/2022.1107.01@LR04.02_MediaRes/testing
|
|
|
Video/2022.0622.01@LR04.02_MediaRes/testing
|
|
|
BASIC_SETUP CMAKE_TARGETS)
|
|
|
@@ -436,14 +435,9 @@ else()
|
|
|
set(CMAKE_INSTALL_LIBDIR ${RVC_RUNTIME_PATH})
|
|
|
endif(MSVC)
|
|
|
|
|
|
-if(FORMAT_UPDATE_PKG)
|
|
|
- set(CPACK_SYSTEM_NAME "${TARGET_PLATFORM}-${BUILD_YEAR}${BUILD_MONTH}${BUILD_DAY}")
|
|
|
- set(CPACK_TOPLEVEL_TAG "${TARGET_PLATFORM}-${BUILD_YEAR}${BUILD_MONTH}${BUILD_DAY}")
|
|
|
-else(FORMAT_UPDATE_PKG)
|
|
|
- set(CPACK_SYSTEM_NAME "${TARGET_PLATFORM}-${BUILD_TYPE_NAME}")
|
|
|
- set(CPACK_TOPLEVEL_TAG "${TARGET_PLATFORM}-${BUILD_TYPE_NAME}")
|
|
|
-endif(FORMAT_UPDATE_PKG)
|
|
|
-
|
|
|
+# set(CPACK_SYSTEM_NAME "${TARGET_PLATFORM}-${BUILD_YEAR}${BUILD_MONTH}${BUILD_DAY}")
|
|
|
+set(CPACK_SYSTEM_NAME "${TARGET_PLATFORM}-${BUILD_TYPE_NAME}")
|
|
|
+set(CPACK_TOPLEVEL_TAG "${TARGET_PLATFORM}-${BUILD_TYPE_NAME}")
|
|
|
|
|
|
if(MSVC)
|
|
|
string(REPLACE "\\" "/" OUTPUT_VERSION_DIR_PATH ${OUTPUT_VERSION_DIR_PATH})
|
gifur