Z991239-5240 #comment 适配器版本内容优化

DevAdapter/CMakeLists.txt

@@ -163,6 +163,19 @@ macro(rvc_dev_config_library _module_name _module_prefix)
     set(${_module_prefix}_CHARACTERISTIC "${${_module_prefix}_VENDOR}.${${_module_prefix}_VERSION}.${${_module_prefix}_BATCH}")
     set(MODULE_FULL_NAME "${_module_name}_${${_module_prefix}_VENDOR}_${${_module_prefix}_VERSION}_${${_module_prefix}_BATCH}")
 
+    if (MSVC AND RVC_INTEGRATE_BUILD)
+	  set (RC_VERSION_MAJOR ${${_module_prefix}_VERSION})
+	  set (RC_VERSION_MINOR ${${_module_prefix}_BATCH})
+	  set (RC_VERSION_BUILD ${MSVC_TOOLSET_VERSION})
+	  set (RC_VERSION_PATCH ${MSVC_VERSION})
+	  configure_file(
+		${CMAKE_SOURCE_DIR}/version.rc.in
+		${CMAKE_CURRENT_BINARY_DIR}/version.rc
+		@ONLY)
+	  set ( ${_module_prefix}_SRCS ${${_module_prefix}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
+	endif()
+
+
     add_library(${MODULE_FULL_NAME} ${${_module_prefix}_SRCS})
 
     set_target_properties(${MODULE_FULL_NAME} PROPERTIES COMPILE_DEFINITIONS "DEVICEBASE_EXPORTS")
@@ -225,25 +238,6 @@ macro(rvc_aggereate_runtime_file)
     endif(RVC_INTEGRATE_BUILD)
 endmacro(rvc_aggereate_runtime_file)
 
-
-
-macro(rvc_set_win_dep_desc _prefix)
-
-	# On windows create dll version information.
-	if (WIN32 AND RVC_INTEGRATE_BUILD)
-	  set (RC_VERSION_MAJOR ${${_prefix}_VERSION})
-	  set (RC_VERSION_MINOR ${${_prefix}_BATCH})
-	  set (RC_VERSION_BUILD ${MSVC_TOOLSET_VERSION})
-	  set (RC_VERSION_PATCH ${MSVC_VERSION})
-	  configure_file(
-		${CMAKE_SOURCE_DIR}/version.rc.in
-		${CMAKE_CURRENT_BINARY_DIR}/version.rc
-		@ONLY)
-	  set ( ${_prefix}_SRCS ${${_prefix}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-	endif()
-
-endmacro(rvc_set_win_dep_desc)
-
 set(DEVADAPTER_CURRENT_INCLUDES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 set(DEVADAPTER_CURRENT_ASSET_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
 set(DEVADAPTER_CURRENT_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/${DIFF_PLATFORM_SUB_DIR}")

DevAdapter/cmbsz/FingerPrint.1.1/CMakeLists.txt

@@ -11,8 +11,6 @@ set(${MODULE_PREFIX}_SRCS SHARED
 	FingerPrint_Impl.cpp
 )
 
-rvc_set_win_dep_desc(${MODULE_PREFIX})
-
 # 适配器工程需要通过此宏替代 add_library
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 

DevAdapter/cmbsz/FingerPrint.7.1/CMakeLists.txt

@@ -11,8 +11,6 @@ set(${MODULE_PREFIX}_SRCS SHARED
 	FingerPrint_Impl.cpp
 )
 
-rvc_set_win_dep_desc(${MODULE_PREFIX})
-
 # 适配器工程需要通过此宏替代 add_library
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 

DevAdapter/cmbsz/cardissuer.1.1/CMakeLists.txt

@@ -7,8 +7,6 @@ set(${MODULE_PREFIX}_SRCS SHARED
         cardissuer_impl.cpp
         )
 
-rvc_set_win_dep_desc(${MODULE_PREFIX})
-
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 
 rvc_dev_target_install(${MODULE_FULL_NAME})

DevAdapter/cmbsz/cardswiper.1.1/CMakeLists.txt

@@ -11,8 +11,6 @@ set(${MODULE_PREFIX}_SRCS SHARED
         cardswiper_impl.cpp
         )
 
-rvc_set_win_dep_desc(${MODULE_PREFIX})
-
 # 适配器工程需要通过此宏替代 add_library
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 

DevAdapter/cmbsz/contactlesscard.1.1/CMakeLists.txt

@@ -7,8 +7,6 @@ set(${MODULE_PREFIX}_SRCS SHARED
         contactless_impl.cpp
         )
 
-rvc_set_win_dep_desc(${MODULE_PREFIX})
-
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 
 rvc_dev_target_install(${MODULE_FULL_NAME})

DevAdapter/cmbsz/gpio.1.1/CMakeLists.txt

@@ -7,8 +7,6 @@ set(${MODULE_PREFIX}_SRCS SHARED
         gpio_impl.cpp
         )
 
-rvc_set_win_dep_desc(${MODULE_PREFIX})
-
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 
 rvc_dev_target_install(${MODULE_FULL_NAME})

DevAdapter/cmbsz/gpio.1.2/CMakeLists.txt

@@ -7,8 +7,6 @@ set(${MODULE_PREFIX}_SRCS SHARED
         gpio_impl.cpp
         )
 
-rvc_set_win_dep_desc(${MODULE_PREFIX})
-
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 
 rvc_dev_target_install(${MODULE_FULL_NAME})

DevAdapter/cmbsz/hspscanner.1.1/CMakeLists.txt

@@ -7,8 +7,6 @@ set(${MODULE_PREFIX}_SRCS SHARED
         hspscanner_impl.cpp
         )
 
-rvc_set_win_dep_desc(${MODULE_PREFIX})
-
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 
 rvc_dev_target_install(${MODULE_FULL_NAME})

DevAdapter/cmbsz/idcer.1.1/CMakeLists.txt

@@ -7,8 +7,6 @@ set(${MODULE_PREFIX}_SRCS SHARED
         idcer_impl.cpp
         )
 
-rvc_set_win_dep_desc(${MODULE_PREFIX})
-
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 
 rvc_dev_target_install(${MODULE_FULL_NAME})

DevAdapter/cmbsz/pinpad.1.1/CMakeLists.txt

@@ -11,8 +11,6 @@ set(${MODULE_PREFIX}_SRCS SHARED
         pinpad_impl.cpp   
         )
 
-rvc_set_win_dep_desc(${MODULE_PREFIX})
-
 # 适配器工程需要通过此宏替代 add_library
 rvc_dev_config_library(${MODULE_NAME} ${MODULE_PREFIX})
 

DevAdapter/include/DeviceBaseClass.h

@@ -56,11 +56,11 @@
 #   define DEVICEBASE_API
 #endif
 
-#ifdef _MSC_VER
-#   if _MSC_VER >= 1920
-#       define NEWER_COMPILER_WORKAROUNDS
-#   endif
-#endif
+//#ifdef _MSC_VER
+//#   if _MSC_VER >= 1920
+//#       define NEWER_COMPILER_WORKAROUNDS
+//#   endif
+//#endif
 
 #ifdef __cplusplus
 extern "C"