diff --git a/.travis/build.sh b/.travis/build.sh index 72cfbbe4d..a91387fd5 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -2,7 +2,6 @@ set -x -conan install .. --build missing 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 90ff8b0bb..48e83d297 100755 --- a/.travis/os_build.sh +++ b/.travis/os_build.sh @@ -3,11 +3,14 @@ set -x if [ "$TRAVIS_OS_NAME" == "linux" ]; then - docker run --rm -v $PWD:/repo -v ~/.travis:/travis berkus/docker-cpp-ci /bin/sh -c "cd /repo/_build_; /repo/.travis/build.sh" + docker run --rm -v $PWD:/repo -v ~/.travis:/travis berkus/docker-cpp-ci /bin/sh -c "cd /repo/_build_; conan install .. --build missing; /repo/.travis/build.sh" fi if [ "$TRAVIS_OS_NAME" == "osx" ]; then cd _build_ + export CC=clang + export CXX=clang++ export EXTRA_CMAKE_FLAGS=-DCMAKE_PREFIX_PATH='/usr/local/opt/qt5/;/usr/local/opt/openal-soft' + conan install -s compiler=apple-clang .. --build missing ../.travis/build.sh fi