Work on OS X Travis builds

This commit is contained in:
Palakis 2017-04-14 22:38:57 +02:00
parent bc1555ca5b
commit 5143090142
2 changed files with 5 additions and 2 deletions

View File

@ -2,8 +2,7 @@
set -ex set -ex
mkdir build && cd build mkdir build && cd build
ls -lh $(brew --prefix qt5)
ls -lhR ../../obs-studio/build
cmake .. \ cmake .. \
-DCMAKE_PREFIX_PATH=$(brew --prefix qt5)/lib/cmake \ -DCMAKE_PREFIX_PATH=$(brew --prefix qt5)/lib/cmake \
-DQt5Core_DIR=$(brew --prefix qt5)/lib/cmake/Qt5Core \ -DQt5Core_DIR=$(brew --prefix qt5)/lib/cmake/Qt5Core \
@ -11,6 +10,7 @@ cmake .. \
-DQt5WebSockets_DIR=$(brew --prefix qt5)/lib/cmake/Qt5WebSockets \ -DQt5WebSockets_DIR=$(brew --prefix qt5)/lib/cmake/Qt5WebSockets \
-DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \ -DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \
-DLIBOBS_LIB=../../obs-studio/build/libobs/libobs.dylib \ -DLIBOBS_LIB=../../obs-studio/build/libobs/libobs.dylib \
-DOBS_FRONTEND_LIB=../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
&& make -j4 && make -j4

View File

@ -128,4 +128,7 @@ endif()
# TODO : OS X build settings and tasks # TODO : OS X build settings and tasks
if(APPLE) if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -fvisibility=default -v") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -fvisibility=default -v")
set_target_properties(obs-websocket PROPERTIES PREFIX "")
target_link_libraries(obs-websocket obs-frontend-api)
endif() endif()