aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <montel@kde.org>2006-05-23 17:28:42 +0000
committerLaurent Montel <montel@kde.org>2006-05-23 17:28:42 +0000
commit2594b8f6ce971342f4f5b6ca4abe13c6acf05636 (patch)
tree47d2d5e7fd56d93562ed3c9897e1c03fbf722b01
parent3e1bfc25990c7f96bba4cddee9b8351c84af579a (diff)
downloadextra-cmake-modules-2594b8f6ce971342f4f5b6ca4abe13c6acf05636.tar.gz
extra-cmake-modules-2594b8f6ce971342f4f5b6ca4abe13c6acf05636.tar.bz2
Search shape for ksnapshot
svn path=/trunk/KDE/kdelibs/; revision=544133
-rw-r--r--modules/FindX11.cmake9
1 files changed, 8 insertions, 1 deletions
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake
index aea1a5f7..e9c3a3c0 100644
--- a/modules/FindX11.cmake
+++ b/modules/FindX11.cmake
@@ -42,6 +42,7 @@ if (UNIX)
FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_dpms_INCLUDE_PATH X11/extensions/dpms.h ${X11_INC_SEARCH_PATH})
FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h ${X11_INC_SEARCH_PATH})
+ FIND_PATH(X11_Xshape_INCLUDE_PATH X11/extensions/shape.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})
@@ -65,7 +66,7 @@ if (UNIX)
FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH)
FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH)
FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH)
-
+
if (X11_X11_INCLUDE_PATH)
set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH})
endif (X11_X11_INCLUDE_PATH)
@@ -78,6 +79,11 @@ if (UNIX)
set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xutil_INCLUDE_PATH})
endif (X11_Xutil_INCLUDE_PATH)
+ if(X11_Xshape_INCLUDE_PATH)
+ set(X11_Xshape_FOUND TRUE)
+ set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xshape_INCLUDE_PATH})
+ endif(X11_Xshape_INCLUDE_PATH)
+
if (X11_X11_LIB)
set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_X11_LIB})
endif (X11_X11_LIB)
@@ -314,6 +320,7 @@ if (UNIX)
X11_Xinput_INCLUDE_PATH
X11_Xft_LIB
X11_Xft_INCLUDE_PATH
+ X11_Xshape_INCLUDE_PATH
)
endif (UNIX)