diff options
| -rw-r--r-- | modules/FindX11.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index d6198f54..ce9962cb 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -46,6 +46,7 @@ if (UNIX) FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xpm_INCLUDE_PATH X11/xpm.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_Xss_LIB Xss ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) @@ -63,7 +64,11 @@ if (UNIX) FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH}) - + FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH}) + if( X11_Xft_INCLUDE_PATH) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xft_INCLUDE_PATH}) + endif (X11_Xft_INCLUDE_PATH) + if (X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) endif (X11_X11_INCLUDE_PATH) @@ -84,6 +89,9 @@ if (UNIX) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) endif (X11_Xext_LIB) + if(X11_Xft_LIB) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xft_LIB}) + endif(X11_Xft_LIB) if (X11_Xau_LIB) set(X11_Xau_FOUND TRUE) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) @@ -304,6 +312,8 @@ if (UNIX) X11_Xpm_LIB X11_Xinput_LIB X11_Xinput_INCLUDE_PATH + X11_Xft_LIB + X11_Xft_INCLUDE_PATH ) endif (UNIX) |