diff options
| author | Johanna Äijälä <johanna.aijala@qt.io> | 2019-03-08 07:41:10 -0800 |
|---|---|---|
| committer | Johanna Äijälä <johanna.aijala@qt.io> | 2019-03-14 05:27:53 +0000 |
| commit | 675deb147463a9354aebd4a487783a41d578917c (patch) | |
| tree | a7a023fbae09fc006a81e3acebe2b99f588f8ebe /coin/provisioning | |
| parent | cc1203311a530fc9e72d16b16f1c8649deb20a7d (diff) | |
Add Squish for MSVC2017 x64 to Win10 x64 machines
Also Squish for MinGW x86 on Win7 x86.
Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning')
| -rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 21dfea39..de04d242 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -129,6 +129,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "msvc141" DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" } else { DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" @@ -146,6 +147,8 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } DownloadAndInstallSquish $version win32 "msvc141" } |