Z991239-5360 #comment WIN添加root-input.ini文件

CMakeLists.txt

@@ -698,29 +698,35 @@ if(DEVOPS_ON)
 		#set(INSTALLSCRIPT_TYPE 2)
 	endif(DEVOPS_ON_CMAKE_PRD)
 endif(DEVOPS_ON)
+
+
 if(MSVC)
 	configure_file("${CMAKE_SOURCE_DIR}/addin/packaging/WIN/installbat.in" "${CMAKE_BINARY_DIR}/install.bat" @ONLY NEWLINE_STYLE CRLF)
 	install(PROGRAMS "${CMAKE_BINARY_DIR}/install.bat" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
 	install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/WIN/Readme.txt" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
-	if(NOT DEVOPS_ON)
-		install(FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}" 
-			DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
-			RENAME "root.ini"
-			COMPONENT scripts)
-	endif(NOT DEVOPS_ON)
 	if(NOT DEVOPS_ON_CMAKE_PRD)
 		install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/WIN/kill.bat" DESTINATION ${RVC_BASE_PATH} COMPONENT scripts)
 	endif(NOT DEVOPS_ON_CMAKE_PRD)
 else(MSVC)
 	file(GLOB BAT_SCRIPTS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/*.sh")
-	file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/root-*.ini")
-	install(FILES ${VENDOR_ROOT_CONFIG_FILES} DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" COMPONENT scripts)
 	install(PROGRAMS ${BAT_SCRIPTS} DESTINATION "${RVC_BASE_PATH}" COMPONENT scripts)
 	configure_file("${CMAKE_SOURCE_DIR}/addin/packaging/UOS/installsh.in" "${CMAKE_BINARY_DIR}/install.sh" @ONLY NEWLINE_STYLE UNIX)
 	install(PROGRAMS "${CMAKE_BINARY_DIR}/install.sh" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
 	install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/Readme.txt" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
 endif(MSVC)
 
+if(DEVOPS_ON)
+	file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/root-*.ini")
+	install(FILES ${VENDOR_ROOT_CONFIG_FILES}
+		DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
+		COMPONENT scripts)
+else()
+	install(FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}" 
+		DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" 
+		RENAME "root.ini"
+		COMPONENT scripts)
+endif(DEVOPS_ON)
+
 list(REMOVE_DUPLICATES RVC_CONAN_DEP_LIBS)
 if(CONAN_LIB_DIRS_QT)
 	message(STATUS "remote qt dir:${CONAN_LIB_DIRS_QT}")