From 9ea4e8960702e9b199d5b03758d7aad4d4302633 Mon Sep 17 00:00:00 2001 From: crueter Date: Fri, 15 Aug 2025 00:35:28 +0200 Subject: [PATCH] [cmake] don't REQUIRE externals deps in root, add boost_headers (#265) boost_headers is actually required for some distros apparently (notably Arch, thanks username227 for spotting it), forces the bundled package for it as well AUR cpp-httplib also does not work with this for some reason, so in order to support `CMAKE_DISABLE_FIND_PACKAGE_httplib` (required for Arch if `cpp-httplib` is installed there), removes REQUIRED from the external propagation calls (wasn't needed anyway idk why I added it) I really wish we had more Arch developers tbh Signed-off-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/265 Reviewed-by: Lizzie --- CMakeLists.txt | 10 +++++----- externals/CMakeLists.txt | 11 +++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c2c0efd83..8fb69b9a3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -616,16 +616,16 @@ endfunction() add_subdirectory(externals) # pass targets from externals -find_package(VulkanHeaders REQUIRED) -find_package(VulkanUtilityLibraries REQUIRED) -find_package(VulkanMemoryAllocator REQUIRED) +find_package(VulkanHeaders) +find_package(VulkanUtilityLibraries) +find_package(VulkanMemoryAllocator) if (ENABLE_WEB_SERVICE) - find_package(httplib REQUIRED) + find_package(httplib) endif() if (ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER) - find_package(cpp-jwt REQUIRED) + find_package(cpp-jwt) endif() if (NOT YUZU_USE_BUNDLED_SDL2) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 38da2a8c34..91659ee595 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -317,6 +317,17 @@ if (YUZU_USE_EXTERNAL_VULKAN_SPIRV_TOOLS) ) endif() +# Boost headers +if (NOT Boost_ADDED AND NOT TARGET Boost::headers) + AddPackage( + NAME boost_headers + REPO "boostorg/headers" + SHA 0456900fad + HASH 50cd75dcdfc5f082225cdace058f47b4fb114a47585f7aee1d22236a910a80b667186254c214fa2fcebac67ae6d37ba4b6e695e1faea8affd6fd42a03cf996e3 + BUNDLED_PACKAGE ON + ) +endif() + # TZDB (Time Zone Database) add_subdirectory(nx_tzdb)