From 9c20675d0e2526c72ab381615c2a3ca3f16f422d Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 14 May 2018 23:32:47 -0700 Subject: Give Ninja build instructions if we've installed Ninja. Change-Id: I629f0e48e1b66ae9bb65f025669fd94b2480e765 Reviewed-on: https://code.wireshark.org/review/27548 Reviewed-by: Guy Harris --- tools/macos-setup.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh index 9c1db539df..47613185d2 100755 --- a/tools/macos-setup.sh +++ b/tools/macos-setup.sh @@ -2389,8 +2389,13 @@ echo "export PATH=$PATH:$qt_base_path/bin" echo echo "mkdir build; cd build" echo "cmake .." -echo "make $MAKE_BUILD_OPTS app_bundle" -echo "make install/strip" +if [ ! -z "$NINJA_VERSION" ]; then + echo "ninja app_bundle" + echo "ninja install/strip" +else + echo "make $MAKE_BUILD_OPTS app_bundle" + echo "make install/strip" +fi echo echo "Make sure you are allowed capture access to the network devices" echo "See: https://wiki.wireshark.org/CaptureSetup/CapturePrivileges" -- cgit v1.2.3