Browse Source

Z991239-5285 #comment 把vbs启动脚本移除,VTM.exe直接生成在version目录

80374374 1 year ago
parent
commit
211ddcbca1
2 changed files with 4 additions and 3 deletions
  1. 3 2
      CMakeLists.txt
  2. 1 1
      Tool/VTMLauncher/CMakeLists.txt

+ 3 - 2
CMakeLists.txt

@@ -447,6 +447,7 @@ set(PACK_INSTALL_PREFIX_VERSION "${PACK_INSTALL_RUN_DIR}/version")
 set(PACK_INSTALL_PREFIX_CUR_VER "${PACK_INSTALL_PREFIX_VERSION}/${RVC_VERSION}")
 set(PACK_INSTALL_DATA_DIR "${PACK_INSTALL_RVC_DIR}/adData")
 set(PACK_INSTALL_MISCS_DIR "${PACK_INSTALL_RVC_DIR}/Other")
+set(RVC_BASE_PATH "${PACK_INSTALL_PREFIX_VERSION}")
 set(RVC_INCLUDE_PATH  "${PACK_INSTALL_PREFIX_CUR_VER}/include")
 set(RVC_LIBRARY_PATH   "${PACK_INSTALL_PREFIX_CUR_VER}/lib")
 set(RVC_RUNTIME_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/bin")
@@ -701,7 +702,7 @@ install(FILES ${CMAKE_BINARY_DIR}/env.ini DESTINATION ${RVC_CONFIG_PATH} COMPONE
 set(active_txt_file "${CMAKE_BINARY_DIR}/active.txt")
 message(STATUS "RVC_VERSION = ${RVC_VERSION}, RVC_VERSION_MAJOR=${RVC_VERSION_MAJOR}, RVC_VERSION_MINOR=${RVC_VERSION_MINOR}, RVC_VERSION_REVISION=${RVC_VERSION_REVISION}, RVC_VERSION_SUFFIX=${RVC_VERSION_SUFFIX}")
 file(WRITE ${active_txt_file} "${RVC_VERSION}")
-install(FILES ${active_txt_file} DESTINATION ${PACK_INSTALL_PREFIX_VERSION} COMPONENT scripts)
+install(FILES ${active_txt_file} DESTINATION ${RVC_BASE_PATH} COMPONENT scripts)
 # Install RunInfo Directory
 # install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/runinfo" DESTINATION "${PACK_INSTALL_RUN_DIR}" 
 #	COMPONENT scripts FILES_MATCHING PATTERN "*.ini")
@@ -717,8 +718,8 @@ else(MSVC)
 	file(GLOB BAT_SCRIPTS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/*.sh")
 	file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/uos/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)
 endif(MSVC)
-install(PROGRAMS ${BAT_SCRIPTS} DESTINATION "${PACK_INSTALL_PREFIX_VERSION}" COMPONENT scripts)
 
 # TODO: rewrite install.sh to match update pacakge.
 if(NOT MSVC AND NOT PACK_AS_DEB_PKG)

+ 1 - 1
Tool/VTMLauncher/CMakeLists.txt

@@ -18,7 +18,7 @@ target_link_directories(${MODULE_NAME} PRIVATE
 set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "VTM")
 
 install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
+    RUNTIME DESTINATION "${RVC_BASE_PATH}"
     ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
     LIBRARY DESTINATION "${RVC_LIBRARY_PATH}"
 	COMPONENT libraries)