mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-17 01:36:32 +08:00
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 <simon.hausmann@qt.io>
This commit is contained in:
committed by
Simon Hausmann
parent
ad1fc7cc5d
commit
7dc66c9528
@@ -2,7 +2,7 @@
|
||||
|
||||
$scriptsPath = "C:\Python27\Scripts"
|
||||
|
||||
& "$scriptsPath\pip.exe" install --upgrade conan==0.15.0
|
||||
& "$scriptsPath\pip.exe" install --upgrade conan==0.16.0
|
||||
|
||||
[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
|
||||
|
||||
@@ -41,7 +41,7 @@ function Run-Conan-Install
|
||||
$process = Start-Process-Logged `
|
||||
"$scriptsPath\conan.exe" `
|
||||
-WorkingDirectory $outpwd `
|
||||
-ArgumentList "install -f $($_.FullName) --verify $($manifestsDir)", `
|
||||
-ArgumentList "install -f $($_.FullName) --no-imports --verify $($manifestsDir)", `
|
||||
'-s', ('compiler="' + $Compiler + '"'), `
|
||||
"-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion) $($extraArgs)" `
|
||||
-NoNewWindow -Wait -Verbose `
|
||||
|
||||
@@ -5,6 +5,7 @@ libxslt/1.1.29@vitallium/stable
|
||||
|
||||
[generators]
|
||||
cmake
|
||||
txt
|
||||
|
||||
[options]
|
||||
icu:shared=True
|
||||
|
||||
@@ -5,6 +5,7 @@ libxslt/1.1.29@vitallium/stable
|
||||
|
||||
[generators]
|
||||
cmake
|
||||
txt
|
||||
|
||||
[options]
|
||||
icu:shared=True
|
||||
|
||||
@@ -6,6 +6,7 @@ zlib/1.2.8@annulen/stable
|
||||
|
||||
[generators]
|
||||
cmake
|
||||
txt
|
||||
|
||||
[options]
|
||||
icu:shared=True
|
||||
|
||||
Reference in New Issue
Block a user