oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

travis: attempt to acquire latest cmake from site

Browse Source
This commit is contained in:
itsmattkc
2020-05-09 17:55:39 +10:00
parent 476e45cfdc
commit a574771552
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis/before_install.sh
-3
View File
@@ -2,9 +2,6 @@
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
# CMake
sudo add-apt-repository ppa:olive-editor/cmake -y
# Qt 5.11
sudo add-apt-repository ppa:beineri/opt-qt-5.11.0-xenial -y
.travis/install.sh
+7 -1
View File
@@ -6,7 +6,13 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg qt511tools libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev libgl1-mesa-dev
sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg qt511tools libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev libopencolorio-dev libopenimageio-dev libgl1-mesa-dev
source /opt/qt*/bin/qt*-env.sh
# Acquire latest cmake (apt somehow gets the wrong version?)
wget -c https://github.com/Kitware/CMake/releases/download/v3.17.2/cmake-3.17.2-Linux-x86_64.sh -O cmake.sh
chmod +x cmake.sh
./cmake.sh --skip-license --prefix=cmake --exclude-dir
export PATH=$PWD/cmake/bin:$PATH
fi