From 9c58e6f90f4d009e35f4ad791a0d2e97fe2373ec Mon Sep 17 00:00:00 2001
From: RickyRister <42636155+RickyRister@users.noreply.github.com>
Date: Sun, 5 Oct 2025 04:31:46 -0700
Subject: [PATCH] Don't use vcpkg on local macOS (#6225)

* Don't use vcpkg on local macOS

* fix typo
---
 .ci/compile.sh                      | 7 +++++++
 .github/workflows/desktop-build.yml | 2 +-
 CMakeLists.txt                      | 6 ++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.ci/compile.sh b/.ci/compile.sh
index 2938e0902..7b0f593e9 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -66,6 +66,10 @@ while [[ $# != 0 ]]; do
         shift
       fi
       ;;
+    '--vcpkg')
+      USE_VCPKG=1
+      shift
+      ;;
     '--dir')
       shift
       if [[ $# == 0 ]]; then
@@ -116,6 +120,9 @@ fi
 if [[ $PACKAGE_TYPE ]]; then
   flags+=("-DCPACK_GENERATOR=$PACKAGE_TYPE")
 fi
+if [[ $USE_VCPKG ]]; then
+  flags+=("-DUSE_VCPKG=1")
+fi
 
 # Add cmake --build flags
 buildflags=(--config "$BUILDTYPE")
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index b1afcbfa5..88d3f352b 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -318,7 +318,7 @@ jobs:
           CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
           VCPKG_DISABLE_METRICS: 1
           VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
-        run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE"
+        run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" --vcpkg
 
       - name: Sign app bundle
         if: matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34afff90b..4d2e4b145 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,8 @@ option(WITH_ORACLE "build oracle" ON)
 option(WITH_DBCONVERTER "build dbconverter" ON)
 # Compile tests
 option(TEST "build tests" OFF)
+# Use vcpkg regardless of OS
+option(USE_VCPKG "Use vcpkg regardless of OS" OFF)
 
 # Default to "Release" build type
 # User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call
@@ -48,8 +50,8 @@ if(USE_CCACHE)
   endif()
 endif()
 
-if(WIN32 OR APPLE)
-  # Use vcpkg toolchain on Windows and macOS
+if(WIN32 OR USE_VCPKG)
+  # Use vcpkg toolchain on Windows (and on macOS in CI)
   set(CMAKE_TOOLCHAIN_FILE
       ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake
       CACHE STRING "Vcpkg toolchain file"