From e2ac05093c52b526a26d099e818469634bbacf8b Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Fri, 9 Sep 2022 06:46:03 +0000 Subject: [PATCH] 8276841: Add support for Visual Studio 2022 Reviewed-by: phh, dcherepanov Backport-of: f65db88b74911e5896d2ff536c4ac97e7f62d98b --- make/autoconf/toolchain_windows.m4 | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/make/autoconf/toolchain_windows.m4 b/make/autoconf/toolchain_windows.m4 index 43806aa884a..6827f2f6648 100644 --- a/make/autoconf/toolchain_windows.m4 +++ b/make/autoconf/toolchain_windows.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ ################################################################################ # The order of these defines the priority by which we try to find them. -VALID_VS_VERSIONS="2019 2017 2013 2015 2012 2010" +VALID_VS_VERSIONS="2019 2017 2022 2013 2015 2012 2010" VS_DESCRIPTION_2010="Microsoft Visual Studio 2010" VS_VERSION_INTERNAL_2010=100 @@ -104,6 +104,21 @@ VS_SDK_PLATFORM_NAME_2019= VS_SUPPORTED_2019=true VS_TOOLSET_SUPPORTED_2019=true +VS_DESCRIPTION_2022="Microsoft Visual Studio 2022" +VS_VERSION_INTERNAL_2022=143 +VS_MSVCR_2022=vcruntime140.dll +VS_VCRUNTIME_1_2022=vcruntime140_1.dll +VS_MSVCP_2022=msvcp140.dll +VS_ENVVAR_2022="VS170COMNTOOLS" +VS_USE_UCRT_2022="true" +VS_VS_INSTALLDIR_2022="Microsoft Visual Studio/2022" +VS_EDITIONS_2022="BuildTools Community Professional Enterprise" +VS_SDK_INSTALLDIR_2022= +VS_VS_PLATFORM_NAME_2022="v143" +VS_SDK_PLATFORM_NAME_2022= +VS_SUPPORTED_2022=true +VS_TOOLSET_SUPPORTED_2022=true + ################################################################################ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],