mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Fix opcua provisioning by sourcing .profile
When CMake is installed it exports its install path into .profile. However, freeopcua doesn't source it as builds do, so it couldn't find the cmake. Also, as Ubuntu is using .profile in our builds, this commit fixes so that the PATH is actually written into the right file. Task-number: QTBUG-65594 Change-Id: I561a88a07872436bb4a3bd62a2d55fd56a130121 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
@@ -50,4 +50,8 @@ appPrefix="cmake-$version-Linux-x86_64"
|
||||
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
|
||||
|
||||
echo "Adding $targetFolder/bin to PATH"
|
||||
echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc
|
||||
if uname -a |grep -q "Ubuntu"; then
|
||||
echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile
|
||||
else
|
||||
echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc
|
||||
fi
|
||||
|
||||
@@ -44,6 +44,7 @@ cd freeopcua
|
||||
git checkout ca75e05a8e63d88dbfc259e1251f405106411b66
|
||||
mkdir build
|
||||
cd build
|
||||
source ~/.profile
|
||||
cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ..
|
||||
make
|
||||
sudo make install
|
||||
|
||||
Reference in New Issue
Block a user