From 07b02d1442b38e3edd800ff7bcdfeb25d9dbd433 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 6 Apr 2021 12:03:31 +1200
Subject: [PATCH] Don't include Console in OSX client-only builds

---
 .github/workflows/pr_build.yml | 2 +-
 server-console/CMakeLists.txt  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index fd465debb9..3b330304f5 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -154,7 +154,7 @@ jobs:
       shell: bash
       run: cmake --build . --config $BUILD_TYPE --target assignment-client $CMAKE_BUILD_EXTRA
     - name: Build Console
-      if: matrix.build_type == 'full'
+      if: matrix.build_type == 'full' || matrix.os == 'windows-latest'
       working-directory: ${{runner.workspace}}/build
       shell: bash
       run: cmake --build . --config $BUILD_TYPE --target packaged-server-console $CMAKE_BUILD_EXTRA
diff --git a/server-console/CMakeLists.txt b/server-console/CMakeLists.txt
index 49742cacf0..fa2fadcebf 100644
--- a/server-console/CMakeLists.txt
+++ b/server-console/CMakeLists.txt
@@ -1,5 +1,10 @@
 set(TARGET_NAME packaged-server-console)
 
+if (CLIENT_ONLY AND APPLE)
+  # Don't include Console.app in client-only OSX DMGs.
+  return()
+endif()
+
 if (PRODUCTION_BUILD)
   set(PRODUCTION_OPTION "--production")
 endif()