aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToni Saario <toni.saario@qt.io>2021-08-26 14:07:53 +0300
committerToni Saario <toni.saario@qt.io>2021-12-03 08:00:16 +0000
commitdfa50ed7c3d2acac35d1a13ccec618fba8064d6f (patch)
tree729a924b7deea06b367dcd6d55ed31ff04daff8e
parentdcded49b88795a218af87349ad23a51a0fd3879c (diff)
Set Conan V2 mode
V2 mode causes conan to raise error when an feature that is being deprecated in conan V2 is used. This allows maintaining V2 compatibility. Pick-to: 6.2 Change-Id: I9c0cb70ce3a194966594d48433763e5423e187f1 Reviewed-by: Simo Fält <simo.falt@qt.io>
-rwxr-xr-xcoin/provisioning/common/unix/install-conan.sh1
-rw-r--r--coin/provisioning/common/windows/conan.ps11
2 files changed, 2 insertions, 0 deletions
diff --git a/coin/provisioning/common/unix/install-conan.sh b/coin/provisioning/common/unix/install-conan.sh
index 6827f6fe..f30a2300 100755
--- a/coin/provisioning/common/unix/install-conan.sh
+++ b/coin/provisioning/common/unix/install-conan.sh
@@ -12,6 +12,7 @@ os="$1"
pip3 install conan --user
SetEnvVar "CONAN_REVISIONS_ENABLED" "1"
+SetEnvVar "CONAN_V2_MODE" "1"
if [ "$os" == "linux" ]; then
SetEnvVar "PATH" "/home/qt/.local/bin:\$PATH"
diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1
index 082600e9..5c635d3c 100644
--- a/coin/provisioning/common/windows/conan.ps1
+++ b/coin/provisioning/common/windows/conan.ps1
@@ -41,6 +41,7 @@ Write-Output "Conan = $version" >> ~\versions.txt
# Add conan to path.
Add-Path $scriptsPath
Set-EnvironmentVariable "CONAN_REVISIONS_ENABLED" "1"
+Set-EnvironmentVariable "CONAN_V2_MODE" "1"
# This is temporary solution for installing packages provided by Conan until we have fixed Conan setup for this