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

Enable conan revisions mode

Browse Source 
Change-Id: I0fb9d6943cf0e6e54f631314a67348f703c31e41
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 3802e21afe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Toni Saario
2021-03-02 17:06:17 +02:00
committed by Qt Cherry-pick Bot
parent 1308663fd6
commit 88b3474bcf
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/common/unix/install-conan.sh
View File

@@ -1,8 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# This script will install Conan # This script will install Conan
# Note! Python3 is required for Conan installation # Note! Python3 is required for Conan installation
# Install Conan to Python user install directory (typically ~./local/) # Install Conan to Python user install directory (typically ~./local/)
pip3 install conan --user pip3 install conan --user
SetEnvVar "CONAN_REVISIONS_ENABLED" "1"

1
coin/provisioning/common/windows/conan.ps1
View File

@@ -43,6 +43,7 @@ Write-Output "Conan = 1.29.0" >> ~\versions.txt
Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force" Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force"
Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos" Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos"
Set-EnvironmentVariable "CONAN_REVISIONS_ENABLED" "1"
function Run-Conan-Install function Run-Conan-Install
{ {