From 514835418c9d8c16eacac8cad5e522a896d4db7b Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Mon, 4 Mar 2019 08:37:24 +0100 Subject: Restore FindFontconfig backward compatibility for plasma-desktop Summary: I don't understand where plasma-desktop actually finds that old find module, but this fixes the build at least. Reviewers: cgiboudeaux Reviewed By: cgiboudeaux Subscribers: kde-frameworks-devel, kde-buildsystem Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D19499 --- find-modules/FindFontconfig.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/find-modules/FindFontconfig.cmake b/find-modules/FindFontconfig.cmake index 937bc45e..6ac23a0a 100644 --- a/find-modules/FindFontconfig.cmake +++ b/find-modules/FindFontconfig.cmake @@ -105,6 +105,12 @@ if(Fontconfig_FOUND AND NOT TARGET Fontconfig::Fontconfig) ) endif() +# backward compatibility, remove in kf6 +set(FONTCONFIG_INCLUDE_DIR "${Fontconfig_INCLUDE_DIRS}") +set(FONTCONFIG_LIBRARIES "${Fontconfig_LIBRARIES}") +set(FONTCONFIG_DEFINITIONS "${Fontconfig_DEFINITIONS}") +mark_as_advanced(FONTCONFIG_INCLUDE_DIR FONTCONFIG_LIBRARIES FONTCONFIG_DEFINITIONS) + include(FeatureSummary) set_package_properties(Fontconfig PROPERTIES URL "https://www.fontconfig.org/" -- cgit v1.2.1