diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-13 13:30:41 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-13 14:04:47 +0200 |
| commit | 14d2852597f7c869e91db2f54d954965af6083fb (patch) | |
| tree | 035bccb3e28f31abef1b1e39a4ca384726d2fb76 /coin/provisioning/qtci-windows-7-x86/11-conan.ps1 | |
| parent | 8c2ecdbc27532cf875cf47ce75654be98b3d7e20 (diff) | |
| parent | 1eae3c41854294216e600f3f4a7dfc3987d30d0b (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Conflicts:
.gitmodules
Ignore qtquick3d for now.
coin/platform_configs/default.txt
coin/platform_configs/default.yaml
coin/platform_configs/qtbase.txt
coin/platform_configs/qtbase.yaml
We use yaml files for configurations now.
Adjust the configurations for Qt6 as it was
done before in the .txt files.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Change-Id: Ica164f8865aed011c550ba7e1e8137e2bf9fdda9
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/11-conan.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/11-conan.ps1 | 11 |
1 files changed, 11 insertions, 0 deletions
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" |