summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/conan.ps1
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-09-16 21:18:46 +0300
committerSimon Hausmann <simon.hausmann@qt.io>2016-09-17 11:06:44 +0000
commite1bfa77391fcf3d50f0d9f9375f5d123710395cf (patch)
treed7fbce04c2c4c29c2236d3811e1f1a5668d5e59b /coin/provisioning/common/conan.ps1
parentfd6fe04cad632edc4e127038c5312cbe5ce6a17b (diff)
Do not use qmake and cmake generator automatically for each conanfile
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>
Diffstat (limited to 'coin/provisioning/common/conan.ps1')
-rw-r--r--coin/provisioning/common/conan.ps12
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/conan.ps1 b/coin/provisioning/common/conan.ps1
index 355e0f18..117cdfc6 100644
--- a/coin/provisioning/common/conan.ps1
+++ b/coin/provisioning/common/conan.ps1
@@ -23,7 +23,7 @@ function Run-Conan-Install
Start-Process `
"C:\Utils\Conan\conan\conan.exe" `
-WorkingDirectory $outpwd `
- -ArgumentList "install -i -f $($_.FullName) -g txt -g qmake -g cmake", `
+ -ArgumentList "install -i -f $($_.FullName)", `
'-s', ('compiler="' + $Compiler + '"'), `
"-s os=Windows -s arch=$($Arch) -s compiler.version=$($CompilerVersion)" `
-NoNewWindow -Wait