From 6e8cb21d80ba26020c881cbada8adc55726a7368 Mon Sep 17 00:00:00 2001 From: Caleb Norton Date: Mon, 2 Dec 2024 20:55:38 -0600 Subject: [PATCH] Build: Require fontconfig on macos --- Meta/CMake/fontconfig.cmake | 2 +- Meta/CMake/skia.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Meta/CMake/fontconfig.cmake b/Meta/CMake/fontconfig.cmake index 4ea63d69bee1..d1b48b658fa0 100644 --- a/Meta/CMake/fontconfig.cmake +++ b/Meta/CMake/fontconfig.cmake @@ -1,6 +1,6 @@ include_guard() -if (NOT APPLE AND NOT ANDROID) +if (NOT ANDROID) find_package(Fontconfig REQUIRED) set(HAS_FONTCONFIG ON CACHE BOOL "" FORCE) add_compile_definitions(USE_FONTCONFIG=1) diff --git a/Meta/CMake/skia.cmake b/Meta/CMake/skia.cmake index 9d1eed1b322a..f871293c7e96 100644 --- a/Meta/CMake/skia.cmake +++ b/Meta/CMake/skia.cmake @@ -5,7 +5,7 @@ include(fontconfig) find_package(unofficial-skia CONFIG) if(unofficial-skia_FOUND) set(SKIA_TARGET unofficial::skia::skia) - if (HAS_FONTCONFIG) + if (HAS_FONTCONFIG AND NOT APPLE) set(CMAKE_LINK_GROUP_USING_no_as_needed_SUPPORTED TRUE CACHE BOOL "Link group using no-as-needed supported") set(CMAKE_LINK_GROUP_USING_no_as_needed "LINKER:--push-state,--no-as-needed" "LINKER:--pop-state" CACHE STRING "Link group using no-as-needed") set_property(TARGET unofficial::skia::skia APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$")