diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-05-29 15:18:31 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-05-30 14:12:42 +0200 |
| commit | ad7dfdef5f9504dfcd600bf4d88a97c35b9d5d6d (patch) | |
| tree | 9986e45f77ee6be77b8e715a576f2c2c77bf048b /configure.ac | |
| parent | 5a74ef3d249ea88cf0bf1f333014809f652a6a41 (diff) | |
Support VC++ 2019 tools v142
Change-Id: I765ff8a80ac37b09e16bb16652f28534d1e575eb
Reviewed-on: https://gerrit.libreoffice.org/73161
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index dfa860de51af..3ded6d71385d 100644 --- a/configure.ac +++ b/configure.ac @@ -5503,7 +5503,7 @@ find_msms() my_msm_files=Microsoft_VC${VCVER}_CRT_x86.msm case "$VCVER" in 150|160) - my_msm_files="Microsoft_VC141_CRT_x86.msm ${my_msm_files}" + my_msm_files="Microsoft_VC141_CRT_x86.msm Microsoft_VC142_CRT_x86.msm ${my_msm_files}" ;; esac AC_MSG_CHECKING([for ${my_msm_files}]) @@ -5577,6 +5577,11 @@ find_msvc_x64_dlls() msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC141.CRT" break fi + AC_MSG_CHECKING([for $VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC142.CRT]) + if test -d "$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC142.CRT"; then + msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC142.CRT" + break + fi if test -d "$VC_PRODUCT_DIR/redist/MSVC/$l/onecore/x64/Microsoft.VC150.CRT"; then msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$l/onecore/x64/Microsoft.VC150.CRT" break |