Switch to Ninja for macOS builds

mixxxdj · Aug 18, 2021 · c5edb37 · c5edb37
1 parent 86be653
commit c5edb37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -172,7 +172,7 @@ jobs:
       if: runner.os == 'macOS'
       run: |
         brew install ccache
-        brew install make # is installed as gmake
+        brew install ninja
 
     - name: "[macOS/Windows] Get build environment name"
       if: runner.os != 'Linux'

diff --git a/tools/macos_buildenv.sh b/tools/macos_buildenv.sh
@@ -91,14 +91,14 @@ case "$1" in
         export VCPKG_OVERLAY_TRIPLETS="${BUILDENV_PATH}/overlay/triplets"
         export VCPKG_DEFAULT_TRIPLET=x64-osx
         export X_VCPKG_APPLOCAL_DEPS_INSTALL=ON
-        export CMAKE_MAKE_PROGRAM=gmake
+        export CMAKE_GENERATOR=Ninja
 
         echo_exported_variables() {
             echo "VCPKG_ROOT=${VCPKG_ROOT}"
             echo "VCPKG_OVERLAY_TRIPLETS=${VCPKG_OVERLAY_TRIPLETS}"
             echo "VCPKG_DEFAULT_TRIPLET=${VCPKG_DEFAULT_TRIPLET}"
             echo "X_VCPKG_APPLOCAL_DEPS_INSTALL=${X_VCPKG_APPLOCAL_DEPS_INSTALL}"
-            echo "CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}"
+            echo "CMAKE_GENERATOR=${CMAKE_GENERATOR}"
         }
 
         if [ -n "${GITHUB_ENV}" ]; then