From ba5211d85f1fe0daf1c133746e091bf6db91ee3a Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 21 Aug 2018 11:00:50 +0200 Subject: Provisioning: Fix open62541 on msvc2015 x86/x64 The correct vcvars resides in Visual Studio 14, not 12. Change-Id: I89e75b4c5c7806ac451f645b3bf341f588818040 Reviewed-by: Oliver Wolff --- coin/provisioning/common/windows/open62541.ps1 | 4 ++-- 1 file 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") { -- cgit v1.2.3