#IQRV #comment RvcVer.h跨平台后失效缺陷修复

Module/CMakeLists.txt

@@ -41,10 +41,11 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
     endif()
 
     message(STATUS "${_module_name} version: ${MOD_VERSION_FULL}")
+    add_definitions(-DRVC_VERSION_STR="${RVC_VERSION}")
 	if(WIN32)
 	    set (RC_VERSION_MAJOR ${RVC_VERSION_MAJOR})
         set (RC_VERSION_MINOR ${MOD_VERSION_MAJOR})
-        set (RC_VERSION_BUILD   ${MOD_VERSION_MINOR})
+        set (RC_VERSION_BUILD ${MOD_VERSION_MINOR})
         set (RC_VERSION_PATCH ${MOD_VERSION_REVISION})
         set(RC_VERSION_DESCRIPTION "${CMAKE_SHARED_LIBRARY_PREFIX}${_module_name}_${MOD_VERSION_FULL}${CMAKE_SHARED_LIBRARY_SUFFIX}")
        configure_file(
@@ -52,10 +53,6 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
         ${CMAKE_CURRENT_BINARY_DIR}/version.rc
         @ONLY)
         set(${_module_prefix}_SRCS ${${_module_prefix}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    else()
-        add_definitions(
-        -DRVC_VERSION_STR="${RVC_VERSION}"
-    )
     endif(WIN32)
 
     set(${_module_name}_TEST_SRCS)

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -7,7 +7,6 @@
 
 #if defined(RVC_OS_WIN)
 #include <io.h>
-#include "..\RvcVer.h"
 #else
 #include <unistd.h>
 #include <fcntl.h>
@@ -1619,12 +1618,7 @@ bool CVtmLoaderFSM::VerifyVer()
 	bool isVerEqual = false;
 	if (Error_Succeed != pConfig->ReadConfigValueInt("Common", "VerifyVersion", VerifyVersion) || Error_Succeed != GetEntityBase()->GetFunction()->GetRunningVersion(activeVer))
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("read [Common]VerifyVersion failed");
-#ifdef RVC_OS_WIN
-	std::string curVer = std::to_string((ULONGLONG)VER_Major) + "." + std::to_string((ULONGLONG)VER_Minor)
-		+ "." + std::to_string((ULONGLONG)VER_Revision) + "." + std::to_string((ULONGLONG)VER_Build);
-#else
 	std::string curVer = std::string(RVC_VERSION_STR);
-#endif
 	if (curVer == activeVer.GetData())
 		isVerEqual = true;