From 7dc66c95289a2b34e88b4e93daa8fff38d918175 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 29 Nov 2016 15:34:40 +0300 Subject: Updated conan to 0.16.0 * Use --no-imports when installing packages, imports will be performed on "make install" step with new "conan imports" command. * Add txt generator to all conanfiles because it will be needed for "conan imports". Change-Id: Ie5e7ac6bfbf14dfa32ce82136b6be5e39476e393 Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'coin/provisioning/qtci-windows-7-x86') diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt index 4253ef09..4a5bc05d 100644 --- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt @@ -6,6 +6,7 @@ zlib/1.2.8@annulen/stable [generators] cmake +txt [options] icu:shared=True -- cgit v1.2.3