aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-windows-7-x86
diff options
context:
space:
mode:
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86')
-rw-r--r--coin/provisioning/qtci-windows-7-x86/03-conan.ps19
-rw-r--r--coin/provisioning/qtci-windows-7-x86/11-conan.ps111
-rw-r--r--coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt24
3 files changed, 28 insertions, 16 deletions
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 807e5480..00000000
--- a/coin/provisioning/qtci-windows-7-x86/03-conan.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-. "$PSScriptRoot\..\common\windows\03-conan.ps1"
-
-Run-Conan-Install `
- -ConanfilesDir "$PSScriptRoot\conanfiles" `
- -BuildinfoDir Mingw53-x86 `
- -Arch x86 `
- -Compiler "gcc" `
- -CompilerVersion "5.3" `
- -CompilerLibcxx "libstdc++11"
diff --git a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1
new file mode 100644
index 00000000..aa380a09
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1
@@ -0,0 +1,11 @@
+. "$PSScriptRoot\..\common\windows\conan.ps1"
+
+Run-Conan-Install `
+ -ConanfilesDir "$PSScriptRoot\conanfiles" `
+ -BuildinfoDir Mingw73-x86 `
+ -Arch x86 `
+ -Compiler "gcc" `
+ -CompilerVersion 7 `
+ -CompilerLibcxx "libstdc++" `
+ -CompilerException "dwarf2" `
+ -CompilerThreads "posix"
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
index 4a5bc05d..7a5a892a 100644
--- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
+++ b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
@@ -1,8 +1,9 @@
[requires]
-icu/57.1@annulen/stable
-libxml2/2.9.4@annulen/stable
-libxslt/1.1.29@annulen/stable
-zlib/1.2.8@annulen/stable
+icu/64.2@qtproject/stable
+libxml2/2.9.9@qtproject/stable
+libxslt/1.1.33@qtproject/stable
+libjpeg-turbo/2.0.2@qtproject/stable
+zlib/1.2.11@qtproject/stable
[generators]
cmake
@@ -10,13 +11,22 @@ txt
[options]
icu:shared=True
+icu:data_packaging=library
+
libxml2:shared=True
+libxml2:iconv=False
+libxml2:icu=True
+libxml2:zlib=False
+
libxslt:shared=True
+
+libjpeg-turbo:shared=False
+
zlib:shared=False
[imports]
-lib, icudt57.dll -> ./bin
-lib, icuin57.dll -> ./bin
-lib, icuuc57.dll -> ./bin
+lib, icudt64.dll -> ./bin
+lib, icuin64.dll -> ./bin
+lib, icuuc64.dll -> ./bin
bin, libxml2-2.dll -> ./bin
bin, libxslt-1.dll -> ./bin