From 0d4bb4ed2dad16710093772825220adc31daa448 Mon Sep 17 00:00:00 2001 From: konrad rzentarzewski Date: Tue, 4 Apr 2017 22:53:38 +0200 Subject: [PATCH] try to build osx version --- CI/before-script-osx.sh | 12 +++++++++--- CI/install-dependencies-osx.sh | 12 ++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/CI/before-script-osx.sh b/CI/before-script-osx.sh index 10840b60..69850316 100755 --- a/CI/before-script-osx.sh +++ b/CI/before-script-osx.sh @@ -2,6 +2,12 @@ set -ex mkdir build && cd build -cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix qt5)/lib/cmake -DQt5WebSockets_DIR=$(brew --prefix qt5)/lib/cmake/Qt5WebSockets -DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs -DLIBOBS_LIB=../../obs-studio/libobs -DCMAKE_INSTALL_PREFIX=/usr && make -j4 - -# /clang_64/lib/cmake/ ? +ls -lh $(brew --prefix qt5) +cmake .. \ + -DCMAKE_PREFIX_PATH=$(brew --prefix qt5) \ + -DWITH_QT5=1 \ + -DQt5WebSockets_DIR=$(brew --prefix qt5)/lib/cmake/Qt5WebSockets \ + -DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \ + -DLIBOBS_LIB=../../obs-studio/libobs \ + -DCMAKE_INSTALL_PREFIX=/usr \ +&& make -j4 diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index 907ebfd7..cf345600 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -17,13 +17,9 @@ cd .. git clone --recursive https://github.com/jp9000/obs-studio cd obs-studio mkdir build && cd build -cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix qt5)/lib/cmake/ && make -j4 - -echo "DEBUG QT5 FindQt5Core.cmake" -find $(brew --prefix qt5) -name FindQt5Core.cmake -echo "DEBUG QT5" -find $(brew --prefix qt5) -echo "END DEBUG" +cmake .. \ + -DCMAKE_PREFIX_PATH=$(brew --prefix qt5) \ + -DWITH_QT5=1 \ +&& make -j4 sudo make install -