From fd6fe04cad632edc4e127038c5312cbe5ce6a17b Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 16 Sep 2016 21:00:28 +0300 Subject: Added cmake_installer, imports and explicit library types to conanfiles Task-number: QTQAINFRA-997 Change-Id: I70b51a47c12928944d9f48be13332fce12296af1 Reviewed-by: Simon Hausmann --- .../qtci-windows-10-x86/conanfiles/qtwebkit.txt | 15 +++++++++++++++ .../qtci-windows-10-x86_64/conanfiles/qtwebkit.txt | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index f1d31a18..8e0447d0 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -1,4 +1,19 @@ [requires] +cmake_installer/0.1@lasote/testing icu/57.1@Vitallium/stable libxml2-qt/2.9.4@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable + +[generators] +virtualenv + +[options] +cmake_installer:version=3.5.2 +icu:shared=True +libxml2-qt:shared=False +libxslt-qt:shared=False + +[imports] +bin, icudt57.dll -> ./bin +bin, icuin57.dll -> ./bin +bin, icuuc57.dll -> ./bin diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index f1d31a18..8e0447d0 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -1,4 +1,19 @@ [requires] +cmake_installer/0.1@lasote/testing icu/57.1@Vitallium/stable libxml2-qt/2.9.4@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable + +[generators] +virtualenv + +[options] +cmake_installer:version=3.5.2 +icu:shared=True +libxml2-qt:shared=False +libxslt-qt:shared=False + +[imports] +bin, icudt57.dll -> ./bin +bin, icuin57.dll -> ./bin +bin, icuuc57.dll -> ./bin -- cgit v1.2.3