diff options
| author | Laurent Montel <montel@kde.org> | 2006-04-13 06:54:57 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2006-04-13 06:54:57 +0000 |
| commit | fd304842c000b155260bd22c2723b36fab4ccd20 (patch) | |
| tree | 59f5d2a88cf87ba4687af7b166ba7a8397f52436 | |
| parent | 32af729d84260c97a8274842cf74f53fd6206577 (diff) | |
| download | extra-cmake-modules-fd304842c000b155260bd22c2723b36fab4ccd20.tar.gz extra-cmake-modules-fd304842c000b155260bd22c2723b36fab4ccd20.tar.bz2 | |
Add X11_XFT_FOUND
svn path=/trunk/KDE/kdelibs/; revision=529328
| -rw-r--r-- | modules/FindX11.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index ce9962cb..b3ba8af4 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -65,9 +65,6 @@ if (UNIX) 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}) @@ -89,9 +86,12 @@ if (UNIX) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) endif (X11_Xext_LIB) - if(X11_Xft_LIB) + if(X11_Xft_LIB AND X11_Xft_INCLUDE_PATH) + set(X11_XFT_FOUND TRUE) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xft_LIB}) - endif(X11_Xft_LIB) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xft_INCLUDE_PATH}) + endif(X11_Xft_LIB AND X11_Xft_INCLUDE_PATH) + if (X11_Xau_LIB) set(X11_Xau_FOUND TRUE) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) |