summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2018-11-12 20:50:05 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2018-11-12 21:10:14 (GMT)
commit40b3dba52995e2c0275ae1712a169173aed6fcbf (patch)
tree23679627ed9827a5da841b858ecb90d4c4f52720 /Modules
parentcc96249e2eee63e90999b1d6cb87dd355696a355 (diff)
downloadCMake-40b3dba52995e2c0275ae1712a169173aed6fcbf.zip
CMake-40b3dba52995e2c0275ae1712a169173aed6fcbf.tar.gz
CMake-40b3dba52995e2c0275ae1712a169173aed6fcbf.tar.bz2
FindX11: require Freetype and Fontconfig for Xft
The Xft header includes headers from freetype and fontconfig, so they are necessary for its use.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindX11.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindX11.cmake b/Modules/FindX11.cmake
index 8a18d4d..01a9ef7 100644
--- a/Modules/FindX11.cmake
+++ b/Modules/FindX11.cmake
@@ -203,7 +203,11 @@ if (UNIX)
endif()
if(X11_Xft_LIB AND X11_Xft_INCLUDE_PATH)
- set(X11_Xft_FOUND TRUE)
+ find_package(Freetype QUIET)
+ find_package(Fontconfig QUIET)
+ if (FREETYPE_FOUND AND FONTCONFIG_FOUND)
+ set(X11_Xft_FOUND TRUE)
+ endif ()
list(APPEND X11_INCLUDE_DIR ${X11_Xft_INCLUDE_PATH})
endif()