diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-06 09:46:18 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-06 10:19:35 +0200 |
| commit | dd3d32d13cf03a9e6ca661408b7995e8493c6af4 (patch) | |
| tree | 019a40a309750b92dcc28ab2bccb76d1b574eddf /coin/provisioning/common/cmake.sh | |
| parent | cc8a7501f329fbfefd1584f18ac7ff413e2d0854 (diff) | |
| parent | 88525879919a3aa36d1753e8d4348201f2a44046 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qtdeclarative.txt
coin/provisioning/common/InstallPKGFromURL.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh
Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
Diffstat (limited to 'coin/provisioning/common/cmake.sh')
| -rwxr-xr-x | coin/provisioning/common/cmake.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/cmake.sh b/coin/provisioning/common/cmake.sh index fe84cd0e..e10dd41d 100755 --- a/coin/provisioning/common/cmake.sh +++ b/coin/provisioning/common/cmake.sh @@ -47,5 +47,5 @@ appPrefix="cmake-3.6.2-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" -echo "export PATH=/Applications/CMake.app/Contents/bin:$PATH" >> ~/.bashrc +echo "export PATH=/Applications/CMake.app/Contents/bin:\$PATH" >> ~/.bashrc echo "CMake = 3.6.2" >> ~/versions.txt |