From ea482a719dcd9c6dd65db86251c094cc8dc169a1 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Tue, 21 Jan 2020 18:54:05 -0700 Subject: [PATCH] OSX Build: Remove ninja Ninja on OSX lately is giving an error where it gets in a cmake reconfiguration loop. It constantly reruns cmake and detects that the build file changed, so it reruns it again and again until it times out. Not going to deal with this right now. --- .travis/macos/build.sh | 4 ++-- .travis/macos/deps.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh index d28b675fd..9a90d7f25 100755 --- a/.travis/macos/build.sh +++ b/.travis/macos/build.sh @@ -7,7 +7,7 @@ export Qt5_DIR=$(brew --prefix)/opt/qt5 export PATH="/usr/local/opt/ccache/libexec:$PATH" mkdir build && cd build -cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_QT_TRANSLATION=ON -DCITRA_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_FFMPEG_AUDIO_DECODER=ON -DENABLE_FFMPEG_VIDEO_DUMPER=ON -ninja +cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_QT_TRANSLATION=ON -DCITRA_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_FFMPEG_AUDIO_DECODER=ON -DENABLE_FFMPEG_VIDEO_DUMPER=ON +make -j4 ctest -VV -C Release diff --git a/.travis/macos/deps.sh b/.travis/macos/deps.sh index 31f00b33c..c80cfc9b3 100755 --- a/.travis/macos/deps.sh +++ b/.travis/macos/deps.sh @@ -2,5 +2,5 @@ brew update brew unlink python@2 -brew install qt5 sdl2 p7zip ccache ffmpeg ninja +brew install qt5 sdl2 p7zip ccache ffmpeg pip3 install macpack