Selaa lähdekoodia

#IQRV #comment [CMake] 添加字体安装包

gifur 4 vuotta sitten
vanhempi
sitoutus
457788914e
2 muutettua tiedostoa jossa 9 lisäystä ja 3 poistoa
  1. 6 1
      CMakeLists.txt
  2. 3 2
      addin/cmake/DependencyConanFiles.cmake

+ 6 - 1
CMakeLists.txt

@@ -574,7 +574,7 @@ else(MSVC)
 endif(MSVC)
 install(FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}" 
 	DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
-	RENAME "root.ini"
+	RENAME "root.ini.dddd"
 	COMPONENT scripts)
 install(PROGRAMS ${BAT_SCRIPTS} DESTINATION "${PACK_INSTALL_PREFIX_VERSION}" COMPONENT scripts)
 
@@ -635,6 +635,11 @@ if(CONAN_RES_DIRS_SOGOUIME)
 	install(DIRECTORY "${CONAN_RES_DIRS_SOGOUIME}" DESTINATION "${PACK_INSTALL_RVC_DIR}/adData" COMPONENT resources)
 endif(CONAN_RES_DIRS_SOGOUIME)
 
+if(CONAN_RES_DIRS_HYQIHEITTF)
+	message(STATUS "include font installation.")
+	install(DIRECTORY "${CONAN_RES_DIRS_HYQIHEITTF}" DESTINATION "${PACK_INSTALL_RVC_DIR}/adData" COMPONENT resources)
+endif(CONAN_RES_DIRS_HYQIHEITTF)
+
 if(CEF_BIN_DIR)
 	file(GLOB RVC_CHROMIUM_BIN_FILES LIST_DIRECTORIES true "${CEF_BIN_DIR}/*")
 	foreach(item ${RVC_CHROMIUM_BIN_FILES})

+ 3 - 2
addin/cmake/DependencyConanFiles.cmake

@@ -80,9 +80,10 @@ else()
 	if(PACK_AS_DEB_PKG)
 		list(APPEND CONAN_CURPLATFORM_LIB_NAMES cefclient_const/1.0@LR04.02_ThirdParty/testing)
 	endif(PACK_AS_DEB_PKG)
-		list(APPEND CONAN_CURPLATFORM_LIB_NAMES sogouime/2.6.0.8357@LR04.02_MediaRes/testing)
-	if(WITH_ADDITIONAL_RES)
 		
+	if(WITH_ADDITIONAL_RES)
+		list(APPEND CONAN_CURPLATFORM_LIB_NAMES sogouime/2.6.0.8357@LR04.02_MediaRes/stable)
+		list(APPEND CONAN_CURPLATFORM_LIB_NAMES HYQiHeiTTF/2021.1021.01@LR04.02_MediaRes/stable)
 	endif(WITH_ADDITIONAL_RES)
 
 endif(MSVC)