lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-05 13:16:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not use qmake and cmake generator automatically for each conanfile

Browse Source 
Keep conanfiles self-contained. "txt" generator is not going to be used
by coin internally, drop it.

Task-number: QTQAINFRA-998
Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Konstantin Tokarev
2016-09-16 21:18:46 +03:00
committed by Simon Hausmann
parent fd6fe04cad
commit e1bfa77391
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/conan.ps1
View File

@@ -23,7 +23,7 @@ function Run-Conan-Install
Start-Process ` Start-Process `
"C:\Utils\Conan\conan\conan.exe" ` "C:\Utils\Conan\conan\conan.exe" `
-WorkingDirectory $outpwd ` -WorkingDirectory $outpwd `
-ArgumentList "install -i -f $($_.FullName) -g txt -g qmake -g cmake", ` -ArgumentList "install -i -f $($_.FullName)", `
'-s', ('compiler="' + $Compiler + '"'), ` '-s', ('compiler="' + $Compiler + '"'), `
"-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" ` "-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" `
-NoNewWindow -Wait -NoNewWindow -Wait

1
coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
View File

@@ -5,6 +5,7 @@ libxml2-qt/2.9.4@Vitallium/stable
libxslt-qt/1.1.29@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable
[generators] [generators]
cmake
virtualenv virtualenv
[options] [options]

1
coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
View File

@@ -5,6 +5,7 @@ libxml2-qt/2.9.4@Vitallium/stable
libxslt-qt/1.1.29@Vitallium/stable libxslt-qt/1.1.29@Vitallium/stable
[generators] [generators]
cmake
virtualenv virtualenv
[options] [options]