diff options
| author | Laurent Montel <montel@kde.org> | 2006-03-24 10:24:44 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2006-03-24 10:24:44 +0000 |
| commit | 341219afc6524c41755b981c45e593a30dc9da5a (patch) | |
| tree | cefe725662188ad4d5bb5f481fd0e49111e8959d | |
| parent | 5e1f287d89cfac8f668b4474f48b1175629cbff5 (diff) | |
| download | extra-cmake-modules-341219afc6524c41755b981c45e593a30dc9da5a.tar.gz extra-cmake-modules-341219afc6524c41755b981c45e593a30dc9da5a.tar.bz2 | |
Search for xpm
svn path=/trunk/KDE/kdelibs/; revision=522055
| -rw-r--r-- | modules/FindX11.cmake | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 9c6b1803..167019fc 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -44,6 +44,7 @@ if (UNIX) FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xkblib_INCLUDE_PATH X11/XKBlib.h ${X11_INC_SEARCH_PATH}) 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_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}) @@ -59,6 +60,7 @@ if (UNIX) FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH}) if (X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -95,6 +97,13 @@ if (UNIX) set(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH}) endif (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) + if (X11_Xpm_INCLUDE_PATH AND X11_Xpm_LIB) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xpm_LIB}) + set(X11_Xpm_FOUND TRUE) + endif (X11_Xpm_INCLUDE_PATH AND X11_Xpm_LIB) + + + if (X11_Xcomposite_INCLUDE_PATH) set(X11_Xcomposite_FOUND TRUE) endif (X11_Xcomposite_INCLUDE_PATH) @@ -270,6 +279,8 @@ if (UNIX) X11_Xkb_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH X11_Xscreensaver_INCLUDE_PATH + X11_Xpm_INCLUDE_PATH + X11_Xpm_LIB ) endif (UNIX) |