From cf1e492c2e6f74b154afc82edd80a1be1e8d6dd0 Mon Sep 17 00:00:00 2001 From: Vijai Kumar S Date: Mon, 25 Nov 2024 20:05:07 +0100 Subject: [PATCH] Disable vcpkg for osx temporarily --- CMakeLists.txt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07a47bde..8df95efb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,11 @@ cmake_policy(SET CMP0048 NEW) set_property(GLOBAL PROPERTY USE_FOLDERS ON) option(USE_PACKAGED_SUBMODULES OFF) +if (APPLE) + message(STATUS "Detected Apple platform. Forcing USE_PACKAGED_SUBMODULES=ON (Universal binary issue)") + set(USE_PACKAGED_SUBMODULES ON CACHE BOOL "Use packaged submodules" FORCE) +endif() + # Conditionally set the vcpkg toolchain file if USE_PACKAGED_SUBMODULES is OFF if (USE_PACKAGED_SUBMODULES) message("USE_PACKAGED_SUBMODULES is ON") @@ -15,15 +20,6 @@ if (USE_PACKAGED_SUBMODULES) option(USE_INCLUDED_SSL "Use included libressl" ON) else() message("USE_PACKAGED_SUBMODULES is OFF") - # Set the vcpkg target triplet for macOS arm64, only on Apple platforms - if (APPLE) - if (NOT DEFINED ENV{VCPKG_TARGET_TRIPLET}) - set(VCPKG_TARGET_TRIPLET "arm64-osx" CACHE STRING "Target triplet for vcpkg on Apple") - endif() - message(STATUS "Using VCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} for Apple platform") - else() - message(STATUS "Apple platform not detected, default triplet will be used") - endif() if (EXISTS "${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake") message("Using VCPKG Toolchain") set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "Vcpkg toolchain file")