From 000d3ede9684022f8f3736e993a202e03f0be543 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 20 Dec 2023 12:23:14 +1000 Subject: [PATCH] Add fontconfig --- external/PDF4QT/CMakeLists.txt | 1 + external/PDF4QT/Pdf4QtLibCore/CMakeLists.txt | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/external/PDF4QT/CMakeLists.txt b/external/PDF4QT/CMakeLists.txt index 56747e06284..bc92ac2ac72 100644 --- a/external/PDF4QT/CMakeLists.txt +++ b/external/PDF4QT/CMakeLists.txt @@ -69,6 +69,7 @@ find_package(OpenSSL REQUIRED) find_package(lcms2 REQUIRED) find_package(ZLIB REQUIRED) find_package(Freetype REQUIRED) +find_package(Fontconfig REQUIRED) find_package(OpenJPEG CONFIG REQUIRED) find_package(JPEG REQUIRED) find_package(PNG REQUIRED) diff --git a/external/PDF4QT/Pdf4QtLibCore/CMakeLists.txt b/external/PDF4QT/Pdf4QtLibCore/CMakeLists.txt index 309f81f6fc9..a622aaf57be 100644 --- a/external/PDF4QT/Pdf4QtLibCore/CMakeLists.txt +++ b/external/PDF4QT/Pdf4QtLibCore/CMakeLists.txt @@ -159,10 +159,15 @@ target_link_libraries(Pdf4QtLibCore PRIVATE ${QT_VERSION_BASE}::Core ${QT_VERSIO target_link_libraries(Pdf4QtLibCore PRIVATE ${LCMS2_LIBRARIES}) target_link_libraries(Pdf4QtLibCore PRIVATE OpenSSL::SSL OpenSSL::Crypto) target_link_libraries(Pdf4QtLibCore PRIVATE ZLIB::ZLIB) -target_link_libraries(Pdf4QtLibCore PRIVATE Freetype::Freetype) +target_link_libraries(Pdf4QtLibCore PRIVATE ${FREETYPE_LIBRARIES}) +target_link_libraries(Pdf4QtLibCore PRIVATE ${Fontconfig_LIBRARIES}) target_link_libraries(Pdf4QtLibCore PRIVATE openjp2) target_link_libraries(Pdf4QtLibCore PRIVATE JPEG::JPEG) +target_include_directories(Pdf4QtLibCore PRIVATE SYSTEM + ${FREETYPE_INCLUDE_DIRS} + ${Fontconfig_INCLUDE_DIRS}) + if(PDF4QT_ENABLE_OPENGL) target_link_libraries(Pdf4QtLibCore PRIVATE Qt6::OpenGL) endif()