Skip to content

Commit

Permalink
Simplify test for installing dependencies from Brew.
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkCallow committed Nov 23, 2023
1 parent a4403b6 commit 631b602
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ env:
# add the list of tests to the cmake test runner.
- CONFIGURATION=Debug,Release PLATFORM=macOS ARCHS=x86_64
FEATURE_DOC=ON FEATURE_JNI=ON FEATURE_LOADTESTS=OpenGL+Vulkan FEATURE_TOOLS=ON
FEATURE_TOOLS_CTS=ON SUPPORT_SSE=ON SUPPORT_OPENCL=OFF DEPLOY_DOCS=YES PACKAGE=YES
FEATURE_TOOLS_CTS=ON LOADTESTS_USE_LOCAL_DEPENDENCIES=ON SUPPORT_SSE=ON
SUPPORT_OPENCL=OFF DEPLOY_DOCS=YES PACKAGE=YES
- CONFIGURATION=Release PLATFORM=macOS ARCHS=arm64
FEATURE_DOC=ON FEATURE_JNI=ON FEATURE_LOADTESTS=OpenGL+Vulkan FEATURE_TESTS=OFF
FEATURE_TOOLS=ON FEATURE_TOOLS_CTS=OFF SUPPORT_SSE=ON SUPPORT_OPENCL=OFF PACKAGE=YES
Expand Down Expand Up @@ -216,13 +217,9 @@ install:
fi
;;
osx)
if [ "$FEATURE_LOADTESTS" != "OFF" -a "$PLATFORM" = "macOS" -a "$ARCHS" = $(uname -m) ]; then
# We're building for the host processor type. Can therefore
# test building with brew installed libraries instead of
# repo included ones.
if [ "$LOADTESTS_USE_LOCAL_DEPENDENCIES" = "ON" ]; then
brew install sdl2
brew install assimp
export LOADTESTS_USE_LOCAL_DEPENDENCIES=ON
fi
./ci_scripts/install_macos.sh
;;
Expand Down

0 comments on commit 631b602

Please sign in to comment.