From f4567a9a5b3500a2caf98f1f416961735ab6948a Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 21 Jan 2020 02:48:22 +1100 Subject: [PATCH] travis: added appropriate linux dependencies --- .travis/install.sh | 2 +- .travis/script.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 7dabf9f465..68f99d580a 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -6,7 +6,7 @@ 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 qttools5-dev libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-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 cmake libopencolorio-dev libopenimageio-dev source /opt/qt*/bin/qt*-env.sh fi diff --git a/.travis/script.sh b/.travis/script.sh index e833de47a1..2de51be4eb 100644 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -31,7 +31,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then # Generate Makefile - cmake . -DQt5LinguistTools_DIR=/usr/lib/x86_64-linux-gnu/cmake/Qt5LinguistTools + cmake . # Make make -j$(nproc) @@ -43,7 +43,7 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then fi # Use `make install` on `appdir` to place files in the correct place - make DESTDIR=appdir -j$(nproc) install + make DESTDIR=appdir install # Download linuxdeployqt wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"