From e1bfa77391fcf3d50f0d9f9375f5d123710395cf Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 16 Sep 2016 21:18:46 +0300 Subject: 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 --- coin/provisioning/common/conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/common/conan.ps1') 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 -- cgit v1.2.3