diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-06-06 03:06:23 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-06-06 03:06:23 +0000 |
| commit | 7d5a849c70533c9f67024f818c0f240dd39ece12 (patch) | |
| tree | c00a53de11aa71a0c5c8ca6c20aa9600066692c7 | |
| parent | 4d5310775b4989ea404037de35d5aefb646eb1d9 (diff) | |
| download | extra-cmake-modules-7d5a849c70533c9f67024f818c0f240dd39ece12.tar.gz extra-cmake-modules-7d5a849c70533c9f67024f818c0f240dd39ece12.tar.bz2 | |
-more fixes to FindX11 with the help from Lubos
X11_Xss_LIB and X11_Xss_FOUND will be removed soon, use X11_Xscreensaver_LIB and X11_Xscreensaver_FOUND instead
Alex
svn path=/trunk/KDE/kdelibs/; revision=672026
| -rw-r--r-- | modules/FindX11.cmake | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 6b29dc51..11b2ca9f 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -13,8 +13,10 @@ # X11_Xcursor_INCLUDE_PATH, X11_Xcursor_LIB, X11_Xcursor_FOUND # X11_Xdamage_INCLUDE_PATH, X11_Xdamage_LIB, X11_Xdamage_FOUND # X11_Xdmcp_INCLUDE_PATH, X11_Xdmcp_LIB, X11_Xdmcp_FOUND -# X11_dpms_INCLUDE_PATH, X11_dpms_FOUND # X11_Xext_LIB, X11_Xext_FOUND +# X11_dpms_INCLUDE_PATH, (in X11_Xext_LIB), X11_dpms_FOUND +# X11_XShm_INCLUDE_PATH, (in X11_Xext_LIB), X11_XShm_FOUND +# X11_Xshape_INCLUDE_PATH, (in X11_Xext_LIB), X11_Xshape_FOUND # X11_Xf86misc_INCLUDE_PATH, X11_Xxf86misc_LIB, X11_Xf86misc_FOUND # X11_xf86vmode_INCLUDE_PATH, X11_Xf86vmode_FOUND # X11_Xfixes_INCLUDE_PATH, X11_Xfixes_LIB, X11_Xfixes_FOUND @@ -25,13 +27,10 @@ # X11_Xkblib_INCLUDE_PATH, X11_Xkb_FOUND # X11_Xpm_INCLUDE_PATH, X11_Xpm_LIB, X11_Xpm_FOUND # X11_XTest_INCLUDE_PATH, X11_XTest_LIB, X11_XTest_FOUND -# X11_XShm_INCLUDE_PATH, X11_XShm_FOUND # X11_Xrandr_INCLUDE_PATH, X11_Xrandr_LIB, X11_Xrandr_FOUND # X11_Xrender_INCLUDE_PATH, X11_Xrender_LIB, X11_Xrender_FOUND -# X11_Xscreensaver_INCLUDE_PATH, X11_Xscreensaver_FOUND -# X11_Xshape_INCLUDE_PATH, X11_Xshape_FOUND -# X11_Xss_LIB, X11_Xss_FOUND -# X11_Xt_LIB, X11_Xt_FOUND +# X11_Xscreensaver_INCLUDE_PATH, X11_Xscreensaver_LIB, X11_Xscreensaver_FOUND +# X11_Xt_INCLUDE_PATH, X11_Xt_LIB, X11_Xt_FOUND # X11_Xutil_INCLUDE_PATH, X11_Xutil_FOUND # X11_Xv_INCLUDE_PATH, X11_Xv_LIB, X11_Xv_FOUND @@ -97,6 +96,7 @@ IF (UNIX) FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xshape_INCLUDE_PATH X11/extensions/shape.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xt_INCLUDE_PATH X11/Intrinsic.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xv_INCLUDE_PATH X11/extensions/Xvlib.h ${X11_INC_SEARCH_PATH}) @@ -117,7 +117,7 @@ IF (UNIX) FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) FIND_LIBRARY(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xss_LIB Xss ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xscreensaver_LIB Xss ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) FIND_LIBRARY(X11_Xv_LIB Xv ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) @@ -155,13 +155,9 @@ IF (UNIX) SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) ENDIF(X11_Xext_LIB) - IF(X11_Xss_LIB) - SET(X11_Xss_FOUND TRUE) - ENDIF(X11_Xss_LIB) - - IF(X11_Xt_LIB) + IF(X11_Xt_LIB AND X11_Xt_INCLUDE_PATH) SET(X11_Xt_FOUND TRUE) - ENDIF(X11_Xt_LIB) + ENDIF(X11_Xt_LIB AND X11_Xt_INCLUDE_PATH) IF(X11_Xft_LIB AND X11_Xft_INCLUDE_PATH) SET(X11_Xft_FOUND TRUE) @@ -252,10 +248,13 @@ IF (UNIX) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcursor_INCLUDE_PATH}) ENDIF (X11_Xcursor_INCLUDE_PATH AND X11_Xcursor_LIB) - IF (X11_Xscreensaver_INCLUDE_PATH) + IF (X11_Xscreensaver_INCLUDE_PATH AND X11_Xscreensaver_LIB) SET(X11_Xscreensaver_FOUND TRUE) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xscreensaver_INCLUDE_PATH}) - ENDIF (X11_Xscreensaver_INCLUDE_PATH) + ENDIF (X11_Xscreensaver_INCLUDE_PATH AND X11_Xscreensaver_LIB) + SET(X11_Xss_FOUND ${X11_Xscreensaver_FOUND}) + SET(X11_Xss_LIB ${X11_Xscreensaver_LIB}) + IF (X11_dpms_INCLUDE_PATH) SET(X11_dpms_FOUND TRUE) @@ -396,7 +395,7 @@ IF (UNIX) X11_Xcursor_INCLUDE_PATH X11_dpms_INCLUDE_PATH X11_Xt_LIB - X11_Xss_LIB + X11_Xt_INCLUDE_PATH X11_Xdmcp_LIB X11_LIBRARIES X11_Xaccessrules_INCLUDE_PATH @@ -406,6 +405,7 @@ IF (UNIX) X11_Xkb_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH X11_Xscreensaver_INCLUDE_PATH + X11_Xscreensaver_LIB X11_Xpm_INCLUDE_PATH X11_Xpm_LIB X11_Xinput_LIB |