forked from osmocom/wireshark
Windows+CMake: Updates for Visual Studio 2019.
Update our redistributable search logic for VS 2019. Change-Id: Icccc550bbe062a91206d4ffddeef7bbfbdb8829b Reviewed-on: https://code.wireshark.org/review/34064 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
parent
b4c6b3981f
commit
5fd0f06bc7
|
@ -82,7 +82,10 @@ endif()
|
|||
# 1913 = VS2017 15.6 / 14.13
|
||||
# 1914 = VS2017 15.7 / 14.14
|
||||
set(_vcredist_name "vcredist_${TARGET_MACHINE}.exe")
|
||||
if(MSVC_VERSION GREATER_EQUAL 1910)
|
||||
if(MSVC_VERSION GREATER_EQUAL 1920)
|
||||
set(_ws_vcredist_subdir "vcredist_MSVC2019")
|
||||
set(_msvs_version 15.0) # Doesn't appear to be set
|
||||
elseif(MSVC_VERSION GREATER_EQUAL 1910)
|
||||
set(_ws_vcredist_subdir "vcredist_MSVC2017")
|
||||
set(_msvs_version 15.0)
|
||||
elseif(MSVC_VERSION GREATER_EQUAL 1900)
|
||||
|
|
|
@ -77,7 +77,9 @@ set (VERSION "${PROJECT_VERSION}")
|
|||
set (PRODUCT_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUILD})
|
||||
|
||||
# Use the merge module that comes with our version of Visual Studio
|
||||
if(MSVC_VERSION GREATER_EQUAL 1910)
|
||||
if(MSVC_VERSION GREATER_EQUAL 1920)
|
||||
set (MSVC_CRT_VERSION "VC142")
|
||||
elseif(MSVC_VERSION GREATER_EQUAL 1910)
|
||||
set (MSVC_CRT_VERSION "VC141")
|
||||
elseif(MSVC_VERSION GREATER_EQUAL 1900)
|
||||
set (MSVC_CRT_VERSION "VC140")
|
||||
|
|
Loading…
Reference in New Issue