From 767b49c552d9e7d854fec0a5337e22e34178ac57 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Wed, 27 Nov 2019 16:12:56 -0700 Subject: [PATCH] testing ninja on macos travis --- .travis/macos/build.sh | 5 ++--- .travis/macos/deps.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh index c1093b7ca..d28b675fd 100755 --- a/.travis/macos/build.sh +++ b/.travis/macos/build.sh @@ -6,9 +6,8 @@ export MACOSX_DEPLOYMENT_TARGET=10.13 export Qt5_DIR=$(brew --prefix)/opt/qt5 export PATH="/usr/local/opt/ccache/libexec:$PATH" -# TODO: Build using ninja instead of make mkdir build && cd build -cmake .. -DCMAKE_OSX_ARCHITECTURES="x86_64;x86_64h" -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 +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 ctest -VV -C Release diff --git a/.travis/macos/deps.sh b/.travis/macos/deps.sh index 32295e94a..fa13afe56 100755 --- a/.travis/macos/deps.sh +++ b/.travis/macos/deps.sh @@ -1,5 +1,5 @@ #!/bin/sh -ex brew update -brew install qt5 sdl2 p7zip ccache ffmpeg +brew install qt5 sdl2 p7zip ccache ffmpeg ninja pip3 install macpack