From 2666f3b21609e0e22ffd1bbeead3ff91b8b0ca93 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 16 Jul 2019 18:38:32 +0300 Subject: Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming convention MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a Reviewed-by: Mårten Nordheim --- coin/provisioning/qtci-windows-7-x86/03-conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-windows-7-x86/03-conan.ps1') diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 index 807e5480..4aa9658d 100644 --- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\03-conan.ps1" +. "$PSScriptRoot\..\common\windows\conan.ps1" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` -- cgit v1.2.3 From 716640a4770c8e11ab5f6e6ebb8db64868c2679b Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 26 Jul 2019 18:57:59 +0300 Subject: Provisioning: update Conan and Conan packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [*] Update Conan to 1.17.0, adjust to change in command line arguments [*] Update Conan packages to up-to-date versions, add libjpeg-turbo and packages for 64-bit MinGW [*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after Python 3 and MinGW [*] Add license header to conan.ps1 Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f Reviewed-by: Mårten Nordheim --- coin/provisioning/qtci-windows-7-x86/03-conan.ps1 | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-7-x86/03-conan.ps1 (limited to 'coin/provisioning/qtci-windows-7-x86/03-conan.ps1') diff --git a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 deleted file mode 100644 index 4aa9658d..00000000 --- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1 +++ /dev/null @@ -1,9 +0,0 @@ -. "$PSScriptRoot\..\common\windows\conan.ps1" - -Run-Conan-Install ` - -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw53-x86 ` - -Arch x86 ` - -Compiler "gcc" ` - -CompilerVersion "5.3" ` - -CompilerLibcxx "libstdc++11" -- cgit v1.2.3