diff --git a/.travis.yml b/.travis.yml index f7809e18..055c4bef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,16 +4,9 @@ matrix: include: - os: linux dist: trusty - services: - - docker - before_install: - - docker run -d --name xenial ubuntu:xenial sleep 15m - - docker ps -a - - docker cp ./CI/install-dependencies-linux.sh xenial:/tmp/ - - docker exec -it xenial /tmp/install-dependencies-linux.sh - before_script: - - docker cp ./CI/before-script-linux.sh xenial:/tmp/ - - docker exec -it xenial /tmp/before-script-linux.sh + sudo: required + before_install: "./CI/install-dependencies-linux.sh" + before_script: "./CI/before-script-linux.sh" - os: osx before_install: "./CI/install-dependencies-osx.sh" diff --git a/CI/before-script-osx.sh b/CI/before-script-osx.sh index 54dcc97a..edef09ba 100755 --- a/CI/before-script-osx.sh +++ b/CI/before-script-osx.sh @@ -2,5 +2,4 @@ set -ex mkdir build && cd build -cmake -DLIBOBS_INCLUDE_DIR="../../obs-studio/libobs" -DCMAKE_INSTALL_PREFIX=/usr .. -make -j4 +cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix qt5) -DQt5WebSockets_DIR=$(brew --prefix qt5)/lib/cmake/Qt5WebSockets -DCMAKE_MODULE_PATH=$(brew --prefix qt5)/lib/cmake/ -DLIBOBS_INCLUDE_DIR=../obs-studio/libobs -DLIBOBS_LIB=../obs-studio/libobs -DCMAKE_INSTALL_PREFIX=/usr && make -j4 diff --git a/CI/install-dependencies-linux.sh b/CI/install-dependencies-linux.sh index 9afc4e06..7e2bc628 100755 --- a/CI/install-dependencies-linux.sh +++ b/CI/install-dependencies-linux.sh @@ -42,14 +42,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 -sudo apt-get install -y libqt5websockets5-dev +cd .. +git clone https://github.com/qt/qtwebsockets/ ./qtwebsockets +cd qtwebsockets +git checkout v5.3.0 +qmake +make -j4 +sudo make install +sudo sed -i -e 's/5.3.0/5.2.1/g' /usr/lib/x86_64-linux-gnu/cmake/Qt5WebSockets/Qt5WebSocketsConfig.cmake # Build obs-studio cd .. diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index b4d45c8f..bb4db4e9 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -17,6 +17,6 @@ cd .. git clone --recursive https://github.com/jp9000/obs-studio cd obs-studio mkdir build && cd build -cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix qt5) -DQt5WebSockets_DIR=$(brew --prefix qt5)/lib/cmake/Qt5WebSockets -DCMAKE_MODULE_PATH=$(brew --prefix qt5)/lib/cmake/ -DLIBOBS_INCLUDE_DIR=~/obs-studio/libobs -DLIBOBS_LIB=~/obs-studio/libobs && make +cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix qt5) -DQt5WebSockets_DIR=$(brew --prefix qt5)/lib/cmake/Qt5WebSockets -DCMAKE_MODULE_PATH=$(brew --prefix qt5)/lib/cmake/ -DLIBOBS_INCLUDE_DIR=../obs-studio/libobs -DLIBOBS_LIB=../obs-studio/libobs && make sudo make install