Z991239-635 #comment 1.更改打包名称的大小写，2.调整版本号定义的位置，3.通过 BUILD_TESING 决定是否添加实体测试案例

CMakeLists.txt

@@ -45,24 +45,6 @@ if ($ENV{BUILD_NUMBER})
 	set(BUILD_NUMBER $ENV{BUILD_NUMBER})
 endif()
 
-
-if(NOT DEFINED BUILD_SHARED_LIBS)
-	set(BUILD_SHARED_LIBS ON)
-endif()
-
-if(BUILD_SHARED_LIBS)
-	message(STATUS "Build shared libraries")
-endif(BUILD_SHARED_LIBS)
-
-# THIS_MONTH(BUILD_NUMBER)
-get_today(BUILD_YEAR BUILD_MONTH BUILD_DAY)
-
-set(RVC_COMPANY "China Merchants Bank" CACHE STRING "China Merchants Bank Corporation")
-set(RVC_PRODUCT "VTM")
-set(RVC_AUTHOR "CCDG")
-set(RVC_COPYRIGHT "Copyright (C) ${BUILD_YEAR}")
-set(RVC_DESCRIPTION "${BUILD_YEAR}.${BUILD_MONTH}")
-
 #Set the project version
 set(RAW_VERSION_STRING "0.0.1-dev1")
 
@@ -84,6 +66,24 @@ else()
 	set(RVC_VERSION_FULL "${RVC_VERSION}")
 endif()
 
+if(NOT DEFINED BUILD_SHARED_LIBS)
+	set(BUILD_SHARED_LIBS ON)
+endif()
+
+if(BUILD_SHARED_LIBS)
+	message(STATUS "Build shared libraries")
+endif(BUILD_SHARED_LIBS)
+
+# THIS_MONTH(BUILD_NUMBER)
+get_today(BUILD_YEAR BUILD_MONTH BUILD_DAY)
+
+set(RVC_COMPANY "China Merchants Bank" CACHE STRING "China Merchants Bank Corporation")
+set(RVC_PRODUCT "VTM")
+set(RVC_AUTHOR "CCDG")
+set(RVC_COPYRIGHT "Copyright (C) ${BUILD_YEAR}")
+set(RVC_DESCRIPTION "${BUILD_YEAR}.${BUILD_MONTH}")
+
+
 # Some buildsystems generated by CMake have a predetermined build-configuration set in the 
 # CMAKE_BUILD_TYPE variable. The buildsystem for the IDEs such as Visual Studio and Xcode are 
 # generated independent of the build-configuration, and the actual build configuration is not known 
@@ -381,8 +381,8 @@ set(CMAKE_INSTALL_LOCAL_ONLY ON)
 # Config package information.
 set(CPACK_SOURCE_IGNORE_FILES "/\\\\.git/;/\\\\.gitignore;/CMakeCache.txt;/\\\\build;/\\\\out")
 string(TOLOWER ${CMAKE_PROJECT_NAME} CMAKE_PROJECT_NAME_lower)
-set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME_lower}-${RVC_VERSION_FULL}-${CPACK_SYSTEM_NAME}")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME_lower}-${RVC_VERSION_FULL}-${CPACK_SYSTEM_NAME}")
+set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${RVC_VERSION_FULL}-${CPACK_SYSTEM_NAME}")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${RVC_VERSION_FULL}-${CPACK_SYSTEM_NAME}")
 # 
 set(CPACK_PACKAGE_NAME "RvcTerminalApplication")
 set(CPACK_PACKAGE_VENDOR "RVC-CCDG")

module/CMakeLists.txt

@@ -2,6 +2,7 @@
 #设置实体名称 ${MODULE_NAME}，和实体前缀定义 ${MODULE_PREFIX}
 macro(define_moudle _module_name)
 	set(MODULE_NAME "mod_${_module_name}")
+    set(ENTITY_NAME "${_module_name}")
 	string(TOUPPER "${MODULE_NAME}" MODULE_PREFIX)
 endmacro(define_moudle)
 
@@ -24,12 +25,12 @@ set(MODULE_BASE_INCLUDES ${ModuleCommonHeadPath} ${RVC_TOOLKIT_INCLUDE_DIR})
 
 set(BUILD_MOUDLE_TEST OFF)
 if(BUILD_TESTING)
-#  TODO:
+    set(BUILD_MOUDLE_TEST ON)
 endif(BUILD_TESTING)
 
 string(TOLOWER ${BUILD_TYPE_NAME} build_type)
 if (build_type STREQUAL debug)
-	set(BUILD_MOUDLE_TEST ON)
+	# set(BUILD_MOUDLE_TEST ON)
 endif()
 
 #对于 Windows 设置实体的版本信息
@@ -52,7 +53,6 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
     endif()
 
     message(STATUS "${_module_name} version: ${MOD_VERSION_FULL}")
-
 	if(WIN32)
 	    set (RC_VERSION_MAJOR ${RVC_VERSION_MAJOR})
         set (RC_VERSION_MINOR ${MOD_VERSION_MAJOR})