|
@@ -163,7 +163,7 @@ 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)
|
|
|
+ if (MSVC)
|
|
|
set (RC_VERSION_MAJOR ${${_module_prefix}_VERSION})
|
|
|
set (RC_VERSION_MINOR ${${_module_prefix}_BATCH})
|
|
|
set (RC_VERSION_BUILD ${MSVC_TOOLSET_VERSION})
|
|
@@ -173,7 +173,7 @@ macro(rvc_dev_config_library _module_name _module_prefix)
|
|
|
${CMAKE_CURRENT_BINARY_DIR}/version.rc
|
|
|
@ONLY)
|
|
|
set ( ${_module_prefix}_SRCS ${${_module_prefix}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
|
|
|
- endif()
|
|
|
+ endif(MSVC)
|
|
|
|
|
|
|
|
|
add_library(${MODULE_FULL_NAME} ${${_module_prefix}_SRCS})
|