mirror of
https://github.com/MariaDB/server.git
synced 2025-02-13 08:55:35 +01:00
MDEV-27446 Windows, MSI - fix redistributable merge module path for VS2022
This commit is contained in:
parent
8265d6d9f6
commit
7dfa1168b4
1 changed files with 13 additions and 30 deletions
|
@ -176,40 +176,23 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio")
|
||||||
SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_CFG_INTDIR}")
|
SET(CONFIG_PARAM "-DCMAKE_INSTALL_CONFIG_NAME=${CMAKE_CFG_INTDIR}")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
IF(MSVC_CRT_TYPE MATCHES "/MD")
|
IF(MSVC_CRT_TYPE MATCHES "/MD" AND (NOT VCRedist_MSM))
|
||||||
# Find out CRT merge module path, we're going to use it in installer
|
# Find out CRT merge module path, we're going to use it in installer
|
||||||
# The path and name depends on VS version
|
|
||||||
IF(MSVC_VERSION LESS 1900)
|
# merge module file name depends on MSVC version.
|
||||||
# VS2015
|
MATH(EXPR VC_CRT_VER "(${MSVC_VERSION} - 1900)/10 + 140")
|
||||||
SET(VCREDIST_MSM_FILENAME Microsoft_VC140_CRT_${WIX_ARCH_SUFFIX}.msm)
|
SET(VCREDIST_MSM_FILENAME Microsoft_VC${VC_CRT_VER}_CRT_${WIX_ARCH_SUFFIX}.msm)
|
||||||
SET(ProgramFilesX86 "ProgramFiles(x86)")
|
|
||||||
FIND_FILE(${VCREDIST_MSM_FILENAME}
|
FILE(GLOB MSM_LIST "C:/Program Files*/Microsoft Visual Studio/*/*/VC/Redist/MSVC/*/MergeModules/${VCREDIST_MSM_FILENAME}")
|
||||||
NO_DEFAULT_PATH
|
LIST(LENGTH MSM_LIST LEN)
|
||||||
PATHS
|
IF(LEN GREATER 0)
|
||||||
"$ENV{${ProgramFilesX86}}/Common Files/Merge Modules"
|
LIST(GET MSM_LIST 0 VCRedist_MSM_Location)
|
||||||
"$ENV{ProgramFiles}/Common Files/Merge Modules"
|
|
||||||
)
|
|
||||||
ELSEIF(MSVC_VERSION LESS 1920)
|
|
||||||
# VS2017
|
|
||||||
SET(VCREDIST_MSM_FILENAME Microsoft_VC141_CRT_${WIX_ARCH_SUFFIX}.msm)
|
|
||||||
FILE(GLOB MSM_LIST "C:/Program Files*/Microsoft Visual Studio/2017/*/VC/Redist/MSVC/*/MergeModules/${VCREDIST_MSM_FILENAME}")
|
|
||||||
LIST(LENGTH MSM_LIST LEN)
|
|
||||||
IF(LEN GREATER 0)
|
|
||||||
LIST(GET MSM_LIST 0 VCRedist_MSM)
|
|
||||||
ENDIF()
|
|
||||||
ELSE()
|
|
||||||
# VS2019
|
|
||||||
SET(VCREDIST_MSM_FILENAME Microsoft_VC142_CRT_${WIX_ARCH_SUFFIX}.msm)
|
|
||||||
FILE(GLOB MSM_LIST "C:/Program Files*/Microsoft Visual Studio/2019/*/VC/Redist/MSVC/*/MergeModules/${VCREDIST_MSM_FILENAME}")
|
|
||||||
LIST(LENGTH MSM_LIST LEN)
|
|
||||||
IF(LEN GREATER 0)
|
|
||||||
LIST(GET MSM_LIST 0 VCRedist_MSM)
|
|
||||||
ENDIF()
|
|
||||||
ENDIF()
|
ENDIF()
|
||||||
IF (NOT VCRedist_MSM)
|
IF (NOT VCRedist_MSM_Location)
|
||||||
MESSAGE(WARNING "Can't find merge module ${VCREDIST_MSM_FILENAME}")
|
MESSAGE(WARNING "Can't find merge module ${VCREDIST_MSM_FILENAME}")
|
||||||
ELSE()
|
ELSE()
|
||||||
FILE(TO_NATIVE_PATH ${VCRedist_MSM} VCRedist_MSM)
|
FILE(TO_NATIVE_PATH ${VCRedist_MSM_Location} VCRedist_MSM_Location)
|
||||||
|
SET(VCRedist_MSM "${VCRedist_MSM_Location}" CACHE INTERNAL "Location of redistributable merge module")
|
||||||
# MESSAGE("VCRedist_MSM=${VCRedist_MSM}")
|
# MESSAGE("VCRedist_MSM=${VCRedist_MSM}")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
Loading…
Add table
Reference in a new issue