|
|
@@ -284,15 +284,10 @@ if(CONAN_CACHE_CLEAR)
|
|
|
conan_local_remove()
|
|
|
endif(CONAN_CACHE_CLEAR)
|
|
|
|
|
|
-if(MSVC)
|
|
|
-conan_cmake_run(REQUIRES RvcFramework/1.10.0.3@LR04.02_FrameworkLib/testing
|
|
|
- Audio/2023.0509.01@LR04.02_MediaRes/testing
|
|
|
-BASIC_SETUP CMAKE_TARGETS)
|
|
|
-else()
|
|
|
-conan_cmake_run(REQUIRES RvcFramework/1.10.0.3@LR04.02_FrameworkLib/dev
|
|
|
+conan_cmake_run(REQUIRES RvcFramework/1.10.1.3@LR04.02_FrameworkLib/dev
|
|
|
Audio/2023.0509.01@LR04.02_MediaRes/testing
|
|
|
BASIC_SETUP CMAKE_TARGETS)
|
|
|
-endif(MSVC)
|
|
|
+
|
|
|
include(DependencyConanFiles)
|
|
|
|
|
|
set(RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS})
|
|
|
@@ -638,8 +633,8 @@ set(CPACK_PACKAGE_VERSION_PATCH ${RVC_VERSION_REVISION})
|
|
|
# Configure package type
|
|
|
if(MSVC)
|
|
|
if( NOT CPACK_GENERATOR)
|
|
|
- set(CPACK_GENERATOR "ZIP")
|
|
|
- message(STATUS "set zip package file type")
|
|
|
+ set(CPACK_GENERATOR "NSIS")
|
|
|
+ #message(STATUS "set zip package file type")
|
|
|
endif()
|
|
|
if(CPACK_GENERATOR MATCHES "NSIS")
|
|
|
set(CPACK_PACKAGE_INSTALL_DIRECTORY "C:\\\\Run")
|
80374374