diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2018-08-21 11:00:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-24 18:24:53 +0000 |
| commit | ba5211d85f1fe0daf1c133746e091bf6db91ee3a (patch) | |
| tree | dd0c19ae7ca709bd149f69c7f4fc175fa2316045 /coin/provisioning | |
| parent | 0125d70806a5310bf90a2c27c1f03d53b3774e2a (diff) | |
Provisioning: Fix open62541 on msvc2015 x86/x64
The correct vcvars resides in Visual Studio 14, not 12.
Change-Id: I89e75b4c5c7806ac451f645b3bf341f588818040
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'coin/provisioning')
| -rw-r--r-- | coin/provisioning/common/windows/open62541.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/open62541.ps1 b/coin/provisioning/common/windows/open62541.ps1 index 508e5b32..7e87cac4 100644 --- a/coin/provisioning/common/windows/open62541.ps1 +++ b/coin/provisioning/common/windows/open62541.ps1 @@ -206,12 +206,12 @@ if ($targetCommand.StartsWith("mingw")) { BuildAndInstallOpen62541 $targetCommand x86 "mingw32-make" } elseif ($targetCommand -eq "msvc2015_x86") { Write-Host "### Creating Open62541 for MSVC2015 x86" - MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC" "vcvarsall.bat x86" + MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat x86" PushDevEnvironment BuildAndInstallOpen62541 msvc2015 x86 jom } elseif ($targetCommand -eq "msvc2015_x64") { Write-Host "### Creating Open62541 for MSVC2015 x64" - MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC" "vcvarsall.bat amd64" + MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat amd64" PushDevEnvironment BuildAndInstallOpen62541 msvc2015 x64 jom } elseif ($targetCommand -eq "msvc2017_x86") { |