diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,8 +254,7 @@ PURPOSE "Needed for KWin's QPA plugin." ) find_package(Fontconfig REQUIRED) -set_package_properties(Fontconfig PROPERTIES DESCRIPTION "Font access configuration library" - URL "http://www.freedesktop.org/wiki/Software/fontconfig" +set_package_properties(Fontconfig PROPERTIES TYPE REQUIRED PURPOSE "Needed for KWin's QPA plugin." ) diff --git a/cmake/modules/FindFontconfig.cmake b/cmake/modules/FindFontconfig.cmake --- a/cmake/modules/FindFontconfig.cmake +++ b/cmake/modules/FindFontconfig.cmake @@ -1,50 +1,89 @@ -# - Try to find the Fontconfig -# Once done this will define +#.rst: +# FindFontconfig +# -------------- # -# FONTCONFIG_FOUND - system has Fontconfig -# FONTCONFIG_INCLUDE_DIR - The include directory to use for the fontconfig headers -# FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG -# FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG +# Try to find Fontconfig. +# Once done this will define the following variables: +# +# ``Fontconfig_FOUND`` +# True if Fontconfig is available +# ``Fontconfig_INCLUDE_DIRS`` +# The include directory to use for the Fontconfig headers +# ``Fontconfig_LIBRARIES`` +# The Fontconfig libraries for linking +# ``Fontconfig_DEFINITIONS`` +# Compiler switches required for using Fontconfig +# ``Fontconfig_VERSION`` +# The version of Fontconfig that has been found +# +# If ``Fontconfig_FOUND`` is True, it will also define the following +# imported target: +# +# ``Fontconfig::Fontconfig`` +#============================================================================= # Copyright (c) 2006,2007 Laurent Montel, +# Copyright (c) 2018 Volker Krause # -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= -if (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +find_package(PkgConfig) +pkg_check_modules(PC_FONTCONFIG QUIET fontconfig) - # in cache already - set(FONTCONFIG_FOUND TRUE) +set(Fontconfig_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER}) +set(Fontconfig_VERSION ${PC_FONTCONFIG_VERSION}) -else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) +find_path(Fontconfig_INCLUDE_DIRS fontconfig/fontconfig.h + PATHS + ${PC_FONTCONFIG_INCLUDE_DIRS} + /usr/X11/include +) - if (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - find_package(PkgConfig) - pkg_check_modules(PC_FONTCONFIG QUIET fontconfig) +find_library(Fontconfig_LIBRARIES NAMES fontconfig + PATHS + ${PC_FONTCONFIG_LIBRARY_DIRS} +) - set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER}) - endif (NOT WIN32) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Fontconfig DEFAULT_MSG Fontconfig_LIBRARIES Fontconfig_INCLUDE_DIRS) - find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h - PATHS - ${PC_FONTCONFIG_INCLUDEDIR} - ${PC_FONTCONFIG_INCLUDE_DIRS} - /usr/X11/include - ) +mark_as_advanced(Fontconfig_LIBRARIES Fontconfig_INCLUDE_DIRS) - find_library(FONTCONFIG_LIBRARIES NAMES fontconfig - PATHS - ${PC_FONTCONFIG_LIBDIR} - ${PC_FONTCONFIG_LIBRARY_DIRS} +if(Fontconfig_FOUND AND NOT TARGET Fontconfig::Fontconfig) + add_library(Fontconfig::Fontconfig UNKNOWN IMPORTED) + set_target_properties(Fontconfig::Fontconfig PROPERTIES + IMPORTED_LOCATION "${Fontconfig_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${Fontconfig_INCLUDE_DIRS}" + INTERFACE_COMPILER_DEFINITIONS "${Fontconfig_DEFINITIONS}" ) +endif() - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(Fontconfig DEFAULT_MSG FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR ) - - mark_as_advanced(FONTCONFIG_LIBRARIES FONTCONFIG_INCLUDE_DIR) - -endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) - +include(FeatureSummary) +set_package_properties(Fontconfig PROPERTIES + URL "https://www.fontconfig.org/" + DESCRIPTION "Fontconfig is a library for configuring and customizing font access" +) diff --git a/plugins/qpa/CMakeLists.txt b/plugins/qpa/CMakeLists.txt --- a/plugins/qpa/CMakeLists.txt +++ b/plugins/qpa/CMakeLists.txt @@ -29,7 +29,7 @@ kwin KF5::WaylandClient ${QT5PLATFORMSUPPORT_LIBS} - ${FONTCONFIG_LIBRARIES} + Fontconfig::Fontconfig ${FREETYPE_LIBRARIES} )