From 70c5b00c90a326f9bbcf1c219561c7aa77b7c416 Mon Sep 17 00:00:00 2001 From: asquelt Date: Tue, 4 Apr 2017 17:22:32 +0200 Subject: [PATCH] try travis build with libqt5websockets5-dev binary --- CI/before-script-linux.sh | 1 - CI/install-dependencies-linux.sh | 15 ++++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CI/before-script-linux.sh b/CI/before-script-linux.sh index 659739b4..54dcc97a 100755 --- a/CI/before-script-linux.sh +++ b/CI/before-script-linux.sh @@ -2,6 +2,5 @@ set -ex mkdir build && cd build -cat /usr/lib/x86_64-linux-gnu/cmake/Qt5WebSockets/Qt5WebSocketsConfig.cmake || : cmake -DLIBOBS_INCLUDE_DIR="../../obs-studio/libobs" -DCMAKE_INSTALL_PREFIX=/usr .. make -j4 diff --git a/CI/install-dependencies-linux.sh b/CI/install-dependencies-linux.sh index 29fade4b..6379eed4 100755 --- a/CI/install-dependencies-linux.sh +++ b/CI/install-dependencies-linux.sh @@ -41,13 +41,14 @@ sudo apt-get install -y \ sudo apt-get install -y qt5-qmake qtbase5-private-dev qtcreator # obs-websocket deps -cd .. -git clone https://github.com/qt/qtwebsockets/ ./qtwebsockets -cd qtwebsockets -git checkout v5.3.0 -qmake -make -j4 -sudo make install +#cd .. +#git clone https://github.com/qt/qtwebsockets/ ./qtwebsockets +#cd qtwebsockets +#git checkout v5.3.0 +#qmake +#make -j4 +#sudo make install +sudo apt-get install -y libqt5websockets5-dev # Build obs-studio cd ..