From 6eac160c9ce23db0cda32e36670c41de131702cc Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Fri, 12 Jan 2018 22:31:38 +0200 Subject: [PATCH] Pass extra cmake flags on osx --- .travis/build.sh | 2 +- .travis/os_build.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis/build.sh b/.travis/build.sh index 2117f7b1e..72cfbbe4d 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -3,6 +3,6 @@ set -x conan install .. --build missing -cmake -G Ninja -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_TESTING=ON .. || exit 1 +cmake -G Ninja -DCMAKE_BUILD_TYPE=$BUILD_TYPE $EXTRA_CMAKE_FLAGS -DBUILD_TESTING=ON .. || exit 1 cmake --build . -- -v || exit 1 ASAN_OPTIONS=alloc_dealloc_mismatch=0 ctest . || exit 1 diff --git a/.travis/os_build.sh b/.travis/os_build.sh index c8e6a71a6..90ff8b0bb 100755 --- a/.travis/os_build.sh +++ b/.travis/os_build.sh @@ -8,5 +8,6 @@ fi if [ "$TRAVIS_OS_NAME" == "osx" ]; then cd _build_ + export EXTRA_CMAKE_FLAGS=-DCMAKE_PREFIX_PATH='/usr/local/opt/qt5/;/usr/local/opt/openal-soft' ../.travis/build.sh fi