From 0958cc4ccaf874bce926e96de6287622766a7978 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 16 Sep 2016 13:54:06 +0300 Subject: [PATCH] Changed BuildinfoDir of conan to use Coin-compatible compiler name Task-number: QTQAINFRA-998 Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-windows-10-x86/conan.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/conan.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-windows-10-x86/conan.ps1 b/coin/provisioning/qtci-windows-10-x86/conan.ps1 index dc299e7b..a30be8d4 100644 --- a/coin/provisioning/qtci-windows-10-x86/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir msvc-2015-x86 ` + -BuildinfoDir MSVC2015-X86 ` -Arch x86 ` -Compiler "Visual Studio" ` -CompilerVersion 14 diff --git a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 index 8c979776..759a251d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/conan.ps1 @@ -2,7 +2,7 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir msvc-2015-x86_64 ` + -BuildinfoDir MSVC2015-X86_64 ` -Arch x86_64 ` -Compiler "Visual Studio" ` -CompilerVersion 14