From a40c9aeb61dcfbae10f759ffc06268fbfd984b01 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sun, 3 May 2026 20:47:05 -0600 Subject: [PATCH] Disable Brotli/HarfBuzz/PNG in vendored Freetype --- extern/CMakeLists.txt | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index bd09f77..88ca78b 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -83,6 +83,24 @@ else () endif () if (AURORA_ENABLE_GX) + find_package(Freetype QUIET) + if (NOT TARGET Freetype::Freetype) + message(STATUS "aurora: Fetching Freetype") + set(FT_DISABLE_BROTLI ON CACHE BOOL "" FORCE) + set(FT_DISABLE_HARFBUZZ ON CACHE BOOL "" FORCE) + set(FT_DISABLE_PNG ON CACHE BOOL "" FORCE) + FetchContent_Declare(Freetype + URL https://download.savannah.gnu.org/releases/freetype/freetype-2.14.3.tar.gz + URL_HASH SHA256=e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c899a1 + DOWNLOAD_EXTRACT_TIMESTAMP TRUE + EXCLUDE_FROM_ALL + ) + FetchContent_MakeAvailable(Freetype) + add_library(Freetype::Freetype ALIAS freetype) + else () + message(STATUS "aurora: Using existing Freetype") + endif () + if (NOT TARGET imgui) message(STATUS "aurora: Fetching imgui") FetchContent_Declare(imgui @@ -112,8 +130,6 @@ if (AURORA_ENABLE_GX) target_link_libraries(imgui_backends PRIVATE imgui ${AURORA_SDL3_TARGET} dawn::webgpu_dawn) target_link_libraries(imgui PUBLIC imgui_backends) - # Optional, replaces stb_freetype if available - find_package(Freetype) # Permit disabling for macOS universal builds option(IMGUI_USE_FREETYPE "Enable freetype with imgui" ON) if (FREETYPE_FOUND AND IMGUI_USE_FREETYPE) @@ -147,7 +163,6 @@ if (AURORA_ENABLE_GX) set(ZSTD_BUILD_STATIC ON) set(ZSTD_BUILD_SHARED OFF) - include(FetchContent) FetchContent_Declare(zstd URL https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.gz URL_HASH SHA256=eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 @@ -162,23 +177,6 @@ if (AURORA_ENABLE_GX) endif () if(AURORA_ENABLE_RMLUI AND NOT TARGET RmlUi) - if(NOT TARGET Freetype::Freetype) - message(STATUS "aurora: Fetching Freetype") - FetchContent_Declare(Freetype - URL https://download.savannah.gnu.org/releases/freetype/freetype-2.14.3.tar.gz - URL_HASH SHA256=e61b31ab26358b946e767ed7eb7f4bb2e507da1cfefeb7a8861ace7fd5c899a1 - DOWNLOAD_EXTRACT_TIMESTAMP TRUE - EXCLUDE_FROM_ALL - ) - FetchContent_MakeAvailable(Freetype) - - if(NOT TARGET Freetype::Freetype) - add_library(Freetype::Freetype ALIAS freetype) - endif() - else() - message(STATUS "aurora: Using existing Freetype") - endif() - message(STATUS "aurora: Fetching RmlUi") FetchContent_Declare(rmlui URL https://github.com/mikke89/RmlUi/archive/f9b8c9e2935d5df2c7dff2c190d3968e99b0c3dc.tar.gz @@ -210,7 +208,6 @@ if (NOT TARGET TracyClient) # Default to off, users can enable the cache variable if they want to use it. set(TRACY_ENABLE OFF CACHE BOOL "Enable Tracy profiling") - include(FetchContent) FetchContent_Declare( tracy URL https://github.com/wolfpld/tracy/archive/a64b9a20294d59421a2f57aeca3c6383d8c48169.tar.gz