summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-18 23:41:16 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-18 23:41:16 +0100
commit57ba8230bdfe7a9c2b9f11368f4e228f3132861b (patch)
treefc489dea5091cce172a58f46503e2d78ce6809f8
parent99595f44f1b3a3c35d8decc671a8933f65220cf3 (diff)
parent2348ead5295079a9ddcde4d339e016f7c3d58b6d (diff)
Merge remote-tracking branch 'origin/5.9.4' into 5.9
-rw-r--r--coin/platform_configs/default.txt2
-rwxr-xr-xcoin/provisioning/common/linux/cmake_linux.sh6
2 files changed, 6 insertions, 2 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 805b32e9..c3af6b5d 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -12,7 +12,7 @@ qtci-linux-Ubuntu-16.04-x86_64-2 GCC
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
-qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo
+qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh
index 7aaa4cb4..27358a20 100755
--- a/coin/provisioning/common/linux/cmake_linux.sh
+++ b/coin/provisioning/common/linux/cmake_linux.sh
@@ -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