diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-04-14 08:30:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-04-14 10:25:22 +0200 |
| commit | 53ba2283c81ea7812538dc1c846a81fcb037fb10 (patch) | |
| tree | 77d7d64a9ba7653f5ab7ca8608433e113a0ed590 /configure.ac | |
| parent | b0067dee80e8c33e5be9ca8acaafe7dab6cfc085 (diff) | |
Latest VS 2022 Preview is 17.6.0 now
...while latest proper VS 2022 is 17.5.4
Change-Id: I7d3ff3dea730cf1490a0198922281792e524ed9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150382
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index d0693d23cd77..a7d04b853365 100644 --- a/configure.ac +++ b/configure.ac @@ -3981,7 +3981,7 @@ map_vs_year_to_version() 2022) vsversion=17;; 2022preview) - vsversion=17.5;; + vsversion=17.6;; *) AC_MSG_ERROR([Assertion failure - invalid argument "$1" to map_vs_year_to_version()]);; esac @@ -4101,7 +4101,7 @@ find_msvc() vcyear=2019 vctoolset=v142 ;; - 17.0 | 17.5) + 17.0 | 17.6) vcyear=2022 vctoolset=v143 ;; @@ -4273,7 +4273,7 @@ if test "$_os" = "WINNT"; then # are always "better", we list them in reverse chronological order. case "$vcnumwithdot" in - 16.0 | 17.0 | 17.5) + 16.0 | 17.0 | 17.6) WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0" ;; esac @@ -6614,7 +6614,7 @@ find_msms() msmdir= case "$VCVER" in - 16.0 | 17.0 | 17.5) + 16.0 | 17.0 | 17.6) for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$l/MergeModules/" echo "$as_me:$LINENO: looking for $my_msm_dir${my_msm_file}])" >&5 @@ -6650,7 +6650,7 @@ find_msvc_x64_dlls() msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT" case "$VCVER" in - 16.0 | 17.0 | 17.5) + 16.0 | 17.0 | 17.6) for crtver in 141 142 143; do for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do echo "$as_me:$LINENO: testing $VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT" >&5 |