diff options
| -rw-r--r-- | modules/FindX11.cmake | 97 |
1 files changed, 64 insertions, 33 deletions
diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 5126582d..fe1de788 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -5,17 +5,35 @@ # X11_LIBRARIES - link against these to use X11 # # and also the following more fine grained variables: -# Include paths: X11_ICE_INCLUDE_PATH X11_Xaccessrules_INCLUDE_PATH, X11_Xaccessstr_INCLUDE_PATH, -# X11_Xcomposite_INCLUDE_PATH, X11_Xcursor_INCLUDE_PATH, X11_Xdamage_INCLUDE_PATH, -# X11_Xdmcp_INCLUDE_PATH, X11_dpms_INCLUDE_PATH, X11_Xf86misc_INCLUDE_PATH, X11_xf86vmode_INCLUDE_PATH, -# X11_Xfixes_INCLUDE_PATH, X11_Xft_INCLUDE_PATH, X11_Xinerama_INCLUDE_PATH, X11_Xinput_INCLUDE_PATH, -# X11_Xkb_INCLUDE_PATH, X11_Xkblib_INCLUDE_PATH, X11_Xpm_INCLUDE_PATH, X11_XTest_INCLUDE_PATH, -# X11_XShm_INCLUDE_PATH, X11_Xrandr_INCLUDE_PATH, X11_Xrender_INCLUDE_PATH, -# X11_Xscreensaver_INCLUDE_PATH, X11_Xshape_INCLUDE_PATH, X11_Xutil_INCLUDE_PATH, X11_Xv_INCLUDE_PATH -# -# Libraries: X11_ICE_LIB, X11_Xau_LIB, X11_Xcomposite_LIB, X11_Xcursor_LIB, X11_Xdamage_LIB Xdamage, -# X11_Xdmcp_LIB, X11_Xext_LIB, X11_Xfixes_LIB, X11_Xft_LIB, X11_Xinerama_LIB, X11_Xinput_LIB, -# X11_Xpm_LIB, X11_Xrandr_LIB, X11_Xrender_LIB, X11_Xss_LIB, X11_Xt_LIB, X11_XTest_LIB, X11_Xv_LIB, X11_Xxf86misc_LIB +# Include paths: X11_ICE_INCLUDE_PATH, X11_ICE_LIB, X11_ICE_FOUND +# X11_Xaccessrules_INCLUDE_PATH, X11_Xaccess_FOUND +# X11_Xaccessstr_INCLUDE_PATH, X11_Xaccess_FOUND +# X11_Xau_INCLUDE_PATH, X11_Xau_LIB, X11_Xau_FOUND +# X11_Xcomposite_INCLUDE_PATH, X11_Xcomposite_LIB, X11_Xcomposite_FOUND +# 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_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 +# X11_Xft_INCLUDE_PATH, X11_Xft_LIB, X11_Xft_FOUND +# X11_Xinerama_INCLUDE_PATH, X11_Xinerama_LIB, X11_Xinerama_FOUND +# X11_Xinput_INCLUDE_PATH, X11_Xinput_LIB, X11_Xinput_FOUND +# X11_Xkb_INCLUDE_PATH, X11_Xkb_FOUND +# 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_Xutil_INCLUDE_PATH, X11_Xutil_FOUND +# X11_Xv_INCLUDE_PATH, X11_Xv_LIB, X11_Xv_FOUND # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -57,6 +75,7 @@ IF (UNIX) FIND_PATH(X11_ICE_INCLUDE_PATH X11/ICE/ICE.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xaccessrules_INCLUDE_PATH X11/extensions/XKBrules.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xaccessstr_INCLUDE_PATH X11/extensions/XKBstr.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xau_INCLUDE_PATH X11/Xauth.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h ${X11_INC_SEARCH_PATH}) @@ -118,37 +137,49 @@ IF (UNIX) ENDIF(X11_Xlib_INCLUDE_PATH) IF(X11_Xutil_INCLUDE_PATH) + SET(X11_Xutil_FOUND TRUE) 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) + ENDIF(X11_Xshape_INCLUDE_PATH) IF(X11_X11_LIB) SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_X11_LIB}) ENDIF(X11_X11_LIB) IF(X11_Xext_LIB) + SET(X11_Xext_FOUND TRUE) 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) + SET(X11_Xt_FOUND TRUE) + ENDIF(X11_Xt_LIB) + IF(X11_Xft_LIB AND X11_Xft_INCLUDE_PATH) - SET(X11_XFT_FOUND TRUE) + SET(X11_Xft_FOUND TRUE) SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xft_LIB}) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xft_INCLUDE_PATH}) ENDIF(X11_Xft_LIB AND X11_Xft_INCLUDE_PATH) + SET(X11_XFT_FOUND ${X11_Xft_FOUND}) IF(X11_Xv_LIB AND X11_Xv_INCLUDE_PATH) - SET(X11_XV_FOUND TRUE) + SET(X11_Xv_FOUND TRUE) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xv_INCLUDE_PATH}) ENDIF(X11_Xv_LIB AND X11_Xv_INCLUDE_PATH) + SET(X11_XV_FOUND ${X11_Xv_FOUND}) - IF (X11_Xau_LIB) + IF (X11_Xau_LIB AND X11_Xau_INCLUDE_PATH) SET(X11_Xau_FOUND TRUE) SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) - ENDIF (X11_Xau_LIB) + ENDIF (X11_Xau_LIB AND X11_Xau_INCLUDE_PATH) IF (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) SET(X11_Xdmcp_FOUND TRUE) @@ -168,15 +199,15 @@ IF (UNIX) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xpm_INCLUDE_PATH}) ENDIF (X11_Xpm_INCLUDE_PATH AND X11_Xpm_LIB) - IF (X11_Xcomposite_INCLUDE_PATH) + IF (X11_Xcomposite_INCLUDE_PATH AND X11_Xcomposite_LIB) SET(X11_Xcomposite_FOUND TRUE) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcomposite_INCLUDE_PATH}) - ENDIF (X11_Xcomposite_INCLUDE_PATH) + ENDIF (X11_Xcomposite_INCLUDE_PATH AND X11_Xcomposite_LIB) - IF (X11_Xdamage_INCLUDE_PATH) + IF (X11_Xdamage_INCLUDE_PATH AND X11_Xdamage_LIB) SET(X11_Xdamage_FOUND TRUE) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdamage_INCLUDE_PATH}) - ENDIF (X11_Xdamage_INCLUDE_PATH) + ENDIF (X11_Xdamage_INCLUDE_PATH AND X11_Xdamage_LIB) IF (X11_XShm_INCLUDE_PATH) SET(X11_XShm_FOUND TRUE) @@ -188,30 +219,30 @@ IF (UNIX) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XTest_INCLUDE_PATH}) ENDIF (X11_XTest_INCLUDE_PATH AND X11_XTest_LIB) - IF (X11_Xinerama_INCLUDE_PATH) + IF (X11_Xinerama_INCLUDE_PATH AND X11_Xinerama_LIB) SET(X11_Xinerama_FOUND TRUE) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinerama_INCLUDE_PATH}) - ENDIF (X11_Xinerama_INCLUDE_PATH) + ENDIF (X11_Xinerama_INCLUDE_PATH AND X11_Xinerama_LIB) - IF (X11_Xfixes_INCLUDE_PATH) + IF (X11_Xfixes_INCLUDE_PATH AND X11_Xfixes_LIB) SET(X11_Xfixes_FOUND TRUE) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xfixes_INCLUDE_PATH}) - ENDIF (X11_Xfixes_INCLUDE_PATH) + ENDIF (X11_Xfixes_INCLUDE_PATH AND X11_Xfixes_LIB) IF (X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB) SET(X11_Xrender_FOUND TRUE) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xrender_INCLUDE_PATH}) ENDIF (X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB) - IF (X11_Xrandr_INCLUDE_PATH) + IF (X11_Xrandr_INCLUDE_PATH AND X11_Xrandr_LIB) SET(X11_Xrandr_FOUND TRUE) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xrandr_INCLUDE_PATH}) - ENDIF (X11_Xrandr_INCLUDE_PATH) + ENDIF (X11_Xrandr_INCLUDE_PATH AND X11_Xrandr_LIB) - IF (X11_Xxf86misc_INCLUDE_PATH) + IF (X11_Xxf86misc_INCLUDE_PATH AND X11_Xxf86misc_LIB) SET(X11_Xxf86misc_FOUND TRUE) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xxf86misc_INCLUDE_PATH}) - ENDIF (X11_Xxf86misc_INCLUDE_PATH) + ENDIF (X11_Xxf86misc_INCLUDE_PATH AND X11_Xxf86misc_LIB) IF (X11_xf86vmode_INCLUDE_PATH) SET(X11_xf86vmode_FOUND TRUE) @@ -317,15 +348,15 @@ IF (UNIX) IF (CMAKE_LIB_IPS_HAS_SHMAT) SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lipc) ENDIF (CMAKE_LIB_IPS_HAS_SHMAT) - ENDIF (NOT CMAKE_HAVE_SHMAT) - ENDIF ($ENV{ISC} MATCHES "^yes$") + ENDIF(NOT CMAKE_HAVE_SHMAT) + ENDIF($ENV{ISC} MATCHES "^yes$") IF (X11_ICE_FOUND) CHECK_LIBRARY_EXISTS("ICE" "IceConnectionNumber" "${X11_LIBRARY_DIR}" CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) - IF (CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) - SET(X11_X_PRE_LIBS -lSM ${X11_ICE_LIB}) - ENDIF (CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) + IF(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) + SET (X11_X_PRE_LIBS -lSM ${X11_ICE_LIB}) + ENDIF(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) ENDIF (X11_ICE_FOUND) # Build the final list of libraries. |