lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-05 14:36:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add conan to path

Browse Source 
Change-Id: I90e028409f606a703fd9b567a221f3f946f11d61
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 32579bc3c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Toni Saario
2021-03-19 12:47:15 +02:00
committed by Qt Cherry-pick Bot
parent 88b3474bcf
commit d1601aa0f9
8 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,15 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# This script will install Conan
# Note! Python3 is required for Conan installation
os="$1"
# Install Conan to Python user install directory (typically ~./local/)
pip3 install conan --user
SetEnvVar "CONAN_REVISIONS_ENABLED" "1"
if [ "$os" == "linux" ]; then
SetEnvVar "PATH" "/home/qt/.local/bin:\$PATH"
elif [ "$os" == "macos" ]; then
SetEnvVar "PATH" "/Users/qt/Library/Python/3.7/bin:\$PATH"
fi

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

@@ -44,6 +44,7 @@ Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintra
Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos"
Set-EnvironmentVariable "CONAN_REVISIONS_ENABLED" "1"
Add-Path $scriptsPath
function Run-Conan-Install
{

2
coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-conan.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/install-conan.sh"
"$BASEDIR/../common/unix/install-conan.sh" "linux"

2
coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/30-install-conan.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/install-conan.sh"
"$BASEDIR/../common/unix/install-conan.sh" "linux"

2
coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-conan.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/install-conan.sh"
"$BASEDIR/../common/unix/install-conan.sh" "linux"

2
coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/30-install-conan.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/install-conan.sh"
"$BASEDIR/../common/unix/install-conan.sh" "linux"

2
coin/provisioning/qtci-macos-10.14-x86_64/30-install-conan.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/install-conan.sh"
"$BASEDIR/../common/unix/install-conan.sh" "macos"

2
coin/provisioning/qtci-macos-10.15-x86_64/30-install-conan.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/install-conan.sh"
"$BASEDIR/../common/unix/install-conan.sh" "macos"