|
@@ -49,7 +49,7 @@ set(RVC_COPYRIGHT "Copyright (C) 2020")
|
|
|
set(RVC_DESCRIPTION "2020.01")
|
|
|
|
|
|
#Set the project version
|
|
|
-set(RAW_VERSION_STRING "0.0.1-dev1")
|
|
|
+set(RAW_VERSION_STRING "1.0.1-dev1")
|
|
|
|
|
|
string(STRIP ${RAW_VERSION_STRING} RAW_VERSION_STRING)
|
|
|
|
|
@@ -91,17 +91,17 @@ endif(MSVC)
|
|
|
|
|
|
if(SIMULATE_DEV_AND_TEST_TEMP)
|
|
|
# simulate the real executive path environment, for debug easily.
|
|
|
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/run/version/1.2.3.4/bin")
|
|
|
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
|
|
-file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
|
|
-file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/run/hardwarecfg")
|
|
|
-file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/run/version/1.2.3.4/cfg")
|
|
|
-file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/run/version/1.2.3.4/mod")
|
|
|
-file(COPY "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}" DESTINATION "${CMAKE_BINARY_DIR}/run/hardwarecfg")
|
|
|
-file(RENAME "${CMAKE_BINARY_DIR}/run/hardwarecfg/${ROOT_INI_NAME}" "${CMAKE_BINARY_DIR}/run/hardwarecfg/root.ini")
|
|
|
-file(GLOB SIMU_CONFIG_FILE "${CMAKE_SOURCE_DIR}/addin/cfg/*.ini")
|
|
|
-file(COPY ${SIMU_CONFIG_FILE} DESTINATION "${CMAKE_BINARY_DIR}/run/version/1.2.3.4/cfg")
|
|
|
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/addin/cfg/shell.ini.in" "${CMAKE_BINARY_DIR}/run/version/1.2.3.4/cfg/shell.ini" @ONLY)
|
|
|
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/run/version/1.2.3.4/bin")
|
|
|
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
|
|
+ file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
|
|
|
+ file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/run/hardwarecfg")
|
|
|
+ file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/run/version/1.2.3.4/cfg")
|
|
|
+ file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/run/version/1.2.3.4/mod")
|
|
|
+ file(COPY "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}" DESTINATION "${CMAKE_BINARY_DIR}/run/hardwarecfg")
|
|
|
+ file(RENAME "${CMAKE_BINARY_DIR}/run/hardwarecfg/${ROOT_INI_NAME}" "${CMAKE_BINARY_DIR}/run/hardwarecfg/root.ini")
|
|
|
+ file(GLOB SIMU_CONFIG_FILE "${CMAKE_SOURCE_DIR}/addin/cfg/*.ini")
|
|
|
+ file(COPY ${SIMU_CONFIG_FILE} DESTINATION "${CMAKE_BINARY_DIR}/run/version/1.2.3.4/cfg")
|
|
|
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/addin/cfg/shell.ini.in" "${CMAKE_BINARY_DIR}/run/version/1.2.3.4/cfg/shell.ini" @ONLY)
|
|
|
endif(SIMULATE_DEV_AND_TEST_TEMP)#end simulate
|
|
|
|
|
|
if(BUILD_TESTING)
|
|
@@ -222,17 +222,17 @@ set(PACK_INSTALL_RUN_DIR "run")
|
|
|
set(PACK_INSTALL_PREFIX_VERSION "${PACK_INSTALL_RUN_DIR}/version")
|
|
|
set(PACK_INSTALL_PREFIX_CUR_VER "${PACK_INSTALL_PREFIX_VERSION}/${RVC_VERSION}")
|
|
|
|
|
|
-set(RVC_INCLUDE_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/include")
|
|
|
-set(RVC_LIBRARY_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/lib")
|
|
|
+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")
|
|
|
-set(RVC_MODULE_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/mod")
|
|
|
-set(RVC_CONFIG_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/cfg")
|
|
|
-set(RVC_VENDOR_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/dep")
|
|
|
-set(RVC_SHARED_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/share")
|
|
|
+set(RVC_MODULE_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/mod")
|
|
|
+set(RVC_CONFIG_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/cfg")
|
|
|
+set(RVC_VENDOR_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/dep")
|
|
|
+set(RVC_SHARED_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/share")
|
|
|
|
|
|
set(CMAKE_INSTALL_INCLUDEDIR ${RVC_INCLUDE_PATH})
|
|
|
-set(CMAKE_INSTALL_LIBDIR ${RVC_LIBRARY_PATH})
|
|
|
-set(CMAKE_INSTALL_BINDIR ${RVC_RUNTIME_PATH})
|
|
|
+set(CMAKE_INSTALL_LIBDIR ${RVC_LIBRARY_PATH})
|
|
|
+set(CMAKE_INSTALL_BINDIR ${RVC_RUNTIME_PATH})
|
|
|
|
|
|
# This macro maybe not be used now!!
|
|
|
# macro(copy_output_on_build module_name output_subdir)
|
|
@@ -257,10 +257,10 @@ set(CPACK_TOPLEVEL_TAG "${CMAKE_SYSTEM_NAME}-${CMAKE_GENERATOR_PLATFORM}-${BUILD
|
|
|
if(WIN32)
|
|
|
# dll rc version
|
|
|
string(TIMESTAMP RC_VERSION_YEAR "%Y")
|
|
|
- set(RC_VERSION_AUTHOR ${RVC_AUTHOR})
|
|
|
+ set(RC_VERSION_AUTHOR ${RVC_AUTHOR})
|
|
|
set(RC_VERSION_COMPANY ${RVC_COMPANY})
|
|
|
- set(RC_VERSION_PRODUCT ${RVC_PRODUCT})
|
|
|
- set(RC_VERSION_PATCH ${BUILD_NUMBER})
|
|
|
+ set(RC_VERSION_PRODUCT ${RVC_PRODUCT})
|
|
|
+ set(RC_VERSION_PATCH ${BUILD_NUMBER})
|
|
|
set(RC_VERSION_DESCRIPTION "${RVC_VERSION_FULL} ${CPACK_SYSTEM_NAME}")
|
|
|
|
|
|
#set previous definitions
|
|
@@ -353,7 +353,6 @@ if(MSVC)
|
|
|
string(REPLACE "\\" "/" OUTPUT_CUR_DISK_PATH ${OUTPUT_CUR_DISK_PATH})
|
|
|
endif(MSVC)
|
|
|
set(CMAKE_INSTALL_PREFIX "${OUTPUT_CUR_DISK_PATH}")
|
|
|
-#set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install") # /${RVC_VERSION}
|
|
|
set(CMAKE_INSTALL_LOCAL_ONLY ON)
|
|
|
|
|
|
# Config package information.
|
|
@@ -365,7 +364,7 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME_lower}-${RVC_VERSION_FU
|
|
|
set(CPACK_PACKAGE_NAME "RvcFramework")
|
|
|
set(CPACK_PACKAGE_VENDOR "RVC-CCDG")
|
|
|
#
|
|
|
-set(CPACK_PACKAGE_VERSION ${RVC_VERSION_FULL})
|
|
|
+set(CPACK_PACKAGE_VERSION ${RVC_VERSION_FULL})
|
|
|
set(CPACK_PACKAGE_VERSION_MAJOR ${RVC_VERSION_MAJOR})
|
|
|
set(CPACK_PACKAGE_VERSION_MINOR ${RVC_VERSION_MINOR})
|
|
|
set(CPACK_PACKAGE_VERSION_PATCH ${RVC_VERSION_REVISION})
|
|
@@ -423,10 +422,8 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/hardwarecfg" DESTINATION "${PACK_IN
|
|
|
if(MSVC)
|
|
|
file(GLOB BAT_SCRIPTS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/*.vbs")
|
|
|
install(FILES "${CMAKE_SOURCE_DIR}/test/rvc_test.bat" DESTINATION ${OUTPUT_CUR_DISK_PATH} COMPONENT scripts)
|
|
|
- # set(ROOT_CONFIG_FILE_PATH "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/root.ini.win32")
|
|
|
else(MSVC)
|
|
|
file(GLOB BAT_SCRIPTS "${CMAKE_SOURCE_DIR}/addin/startup_scripts/*.sh")
|
|
|
- # set(ROOT_CONFIG_FILE_PATH "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/root.ini.unix")
|
|
|
endif(MSVC)
|
|
|
install(FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/${ROOT_INI_NAME}"
|
|
|
DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg"
|