From a6f951a920cc9b57aa36285d1201f7ebf0ad0265 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 19 Jan 2006 22:50:30 +0000 Subject: -fix ui3 handling Alex svn path=/trunk/KDE/kdesdk/cmake/; revision=500305 --- modules/FindX11.cmake | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 modules/FindX11.cmake (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake new file mode 100644 index 00000000..25d6e1e4 --- /dev/null +++ b/modules/FindX11.cmake @@ -0,0 +1,151 @@ +# - Find X11 installation +# Try to find X11 on UNIX systems. The following values are defined +# X11_FOUND - True if X11 is available +# X11_INCLUDE_DIR - include directories to use X11 +# X11_LIBRARIES - link against these to use X11 + +IF (UNIX) + SET(X11_FOUND 0) + + SET(X11_INC_SEARCH_PATH + /usr/X11R6/include + /usr/local/include + /usr/include/X11 + /usr/openwin/include + /usr/openwin/share/include + /opt/graphics/OpenGL/include + /usr/include + ) + + SET(X11_LIB_SEARCH_PATH + /usr/X11R6/lib + /usr/local/lib + /usr/openwin/lib + /usr/lib + ) + + FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xlib_INCLUDE_PATH X11/Xlib.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h ${X11_INC_SEARCH_PATH}) + FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) + + IF(X11_X11_INCLUDE_PATH) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) + ENDIF(X11_X11_INCLUDE_PATH) + + IF(X11_Xlib_INCLUDE_PATH) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xlib_INCLUDE_PATH}) + ENDIF(X11_Xlib_INCLUDE_PATH) + + IF(X11_Xutil_INCLUDE_PATH) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xutil_INCLUDE_PATH}) + ENDIF(X11_Xutil_INCLUDE_PATH) + + IF(X11_X11_LIB) + SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_X11_LIB}) + ENDIF(X11_X11_LIB) + + IF(X11_Xext_LIB) + SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) + ENDIF(X11_Xext_LIB) + + # Deprecated variable for backwards compatibility with CMake 1.4 + IF(X11_X11_INCLUDE_PATH) + IF(X11_LIBRARIES) + SET(X11_FOUND 1) + ENDIF(X11_LIBRARIES) + ENDIF(X11_X11_INCLUDE_PATH) + + SET(X11_LIBRARY_DIR "") + IF(X11_X11_LIB) + GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH) + ENDIF(X11_X11_LIB) + + IF(X11_FOUND) + INCLUDE(CheckFunctionExists) + INCLUDE(CheckLibraryExists) + + # Translated from an autoconf-generated configure script. + # See libs.m4 in autoconf's m4 directory. + IF($ENV{ISC} MATCHES "^yes$") + SET(X11_X_EXTRA_LIBS -lnsl_s -linet) + ELSE($ENV{ISC} MATCHES "^yes$") + SET(X11_X_EXTRA_LIBS "") + + # See if XOpenDisplay in X11 works by itself. + CHECK_LIBRARY_EXISTS("${X11_LIBRARIES}" "XOpenDisplay" "${X11_LIBRARY_DIR}" X11_LIB_X11_SOLO) + IF(NOT X11_LIB_X11_SOLO) + # Find library needed for dnet_ntoa. + CHECK_LIBRARY_EXISTS("dnet" "dnet_ntoa" "" X11_LIB_DNET_HAS_DNET_NTOA) + IF (X11_LIB_DNET_HAS_DNET_NTOA) + SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet) + ELSE (X11_LIB_DNET_HAS_DNET_NTOA) + CHECK_LIBRARY_EXISTS("dnet_stub" "dnet_ntoa" "" X11_LIB_DNET_STUB_HAS_DNET_NTOA) + IF (X11_LIB_DNET_STUB_HAS_DNET_NTOA) + SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub) + ENDIF (X11_LIB_DNET_STUB_HAS_DNET_NTOA) + ENDIF (X11_LIB_DNET_HAS_DNET_NTOA) + ENDIF(NOT X11_LIB_X11_SOLO) + + # Find library needed for gethostbyname. + CHECK_FUNCTION_EXISTS("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME) + IF(NOT CMAKE_HAVE_GETHOSTBYNAME) + CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + IF (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl) + ELSE (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + CHECK_LIBRARY_EXISTS("bsd" "gethostbyname" "" CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) + IF (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) + SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd) + ENDIF (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) + ENDIF (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + ENDIF(NOT CMAKE_HAVE_GETHOSTBYNAME) + + # Find library needed for connect. + CHECK_FUNCTION_EXISTS("connect" CMAKE_HAVE_CONNECT) + IF(NOT CMAKE_HAVE_CONNECT) + CHECK_LIBRARY_EXISTS("socket" "connect" "" CMAKE_LIB_SOCKET_HAS_CONNECT) + IF (CMAKE_LIB_SOCKET_HAS_CONNECT) + SET (X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS}) + ENDIF (CMAKE_LIB_SOCKET_HAS_CONNECT) + ENDIF(NOT CMAKE_HAVE_CONNECT) + + # Find library needed for remove. + CHECK_FUNCTION_EXISTS("remove" CMAKE_HAVE_REMOVE) + IF(NOT CMAKE_HAVE_REMOVE) + CHECK_LIBRARY_EXISTS("posix" "remove" "" CMAKE_LIB_POSIX_HAS_REMOVE) + IF (CMAKE_LIB_POSIX_HAS_REMOVE) + SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix) + ENDIF (CMAKE_LIB_POSIX_HAS_REMOVE) + ENDIF(NOT CMAKE_HAVE_REMOVE) + + # Find library needed for shmat. + CHECK_FUNCTION_EXISTS("shmat" CMAKE_HAVE_SHMAT) + IF(NOT CMAKE_HAVE_SHMAT) + CHECK_LIBRARY_EXISTS("ipc" "shmat" "" CMAKE_LIB_IPS_HAS_SHMAT) + 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$") + + 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 -lICE) + ENDIF(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) + # Build the final list of libraries. + SET (X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS}) + ENDIF(X11_FOUND) + + MARK_AS_ADVANCED( + X11_X11_INCLUDE_PATH + X11_X11_LIB + X11_Xext_LIB + X11_Xlib_INCLUDE_PATH + X11_Xutil_INCLUDE_PATH + X11_LIBRARIES + ) + +ENDIF (UNIX) -- cgit v1.2.1 From ffc69376dc591eae7b0ed2e974a599fb1b8b2aa8 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 15 Feb 2006 10:47:36 +0000 Subject: Lowercase some common keywords to improve readability svn path=/trunk/KDE/kdelibs/; revision=509624 --- modules/FindX11.cmake | 146 +++++++++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 73 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 25d6e1e4..f0e61210 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -4,10 +4,10 @@ # X11_INCLUDE_DIR - include directories to use X11 # X11_LIBRARIES - link against these to use X11 -IF (UNIX) - SET(X11_FOUND 0) +if (UNIX) + set(X11_FOUND 0) - SET(X11_INC_SEARCH_PATH + set(X11_INC_SEARCH_PATH /usr/X11R6/include /usr/local/include /usr/include/X11 @@ -17,7 +17,7 @@ IF (UNIX) /usr/include ) - SET(X11_LIB_SEARCH_PATH + set(X11_LIB_SEARCH_PATH /usr/X11R6/lib /usr/local/lib /usr/openwin/lib @@ -30,114 +30,114 @@ IF (UNIX) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) - IF(X11_X11_INCLUDE_PATH) - SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) - ENDIF(X11_X11_INCLUDE_PATH) + if(X11_X11_INCLUDE_PATH) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) + endif(X11_X11_INCLUDE_PATH) - IF(X11_Xlib_INCLUDE_PATH) - SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xlib_INCLUDE_PATH}) - ENDIF(X11_Xlib_INCLUDE_PATH) + if(X11_Xlib_INCLUDE_PATH) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xlib_INCLUDE_PATH}) + endif(X11_Xlib_INCLUDE_PATH) - IF(X11_Xutil_INCLUDE_PATH) - SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xutil_INCLUDE_PATH}) - ENDIF(X11_Xutil_INCLUDE_PATH) + if(X11_Xutil_INCLUDE_PATH) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xutil_INCLUDE_PATH}) + endif(X11_Xutil_INCLUDE_PATH) - IF(X11_X11_LIB) - SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_X11_LIB}) - ENDIF(X11_X11_LIB) + if(X11_X11_LIB) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_X11_LIB}) + endif(X11_X11_LIB) - IF(X11_Xext_LIB) - SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) - ENDIF(X11_Xext_LIB) + if(X11_Xext_LIB) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) + endif(X11_Xext_LIB) # Deprecated variable for backwards compatibility with CMake 1.4 - IF(X11_X11_INCLUDE_PATH) - IF(X11_LIBRARIES) - SET(X11_FOUND 1) - ENDIF(X11_LIBRARIES) - ENDIF(X11_X11_INCLUDE_PATH) - - SET(X11_LIBRARY_DIR "") - IF(X11_X11_LIB) + if(X11_X11_INCLUDE_PATH) + if(X11_LIBRARIES) + set(X11_FOUND 1) + endif(X11_LIBRARIES) + endif(X11_X11_INCLUDE_PATH) + + set(X11_LIBRARY_DIR "") + if(X11_X11_LIB) GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH) - ENDIF(X11_X11_LIB) + endif(X11_X11_LIB) - IF(X11_FOUND) + if(X11_FOUND) INCLUDE(CheckFunctionExists) INCLUDE(CheckLibraryExists) # Translated from an autoconf-generated configure script. # See libs.m4 in autoconf's m4 directory. - IF($ENV{ISC} MATCHES "^yes$") - SET(X11_X_EXTRA_LIBS -lnsl_s -linet) - ELSE($ENV{ISC} MATCHES "^yes$") - SET(X11_X_EXTRA_LIBS "") + if($ENV{ISC} MATCHES "^yes$") + set(X11_X_EXTRA_LIBS -lnsl_s -linet) + else($ENV{ISC} MATCHES "^yes$") + set(X11_X_EXTRA_LIBS "") # See if XOpenDisplay in X11 works by itself. CHECK_LIBRARY_EXISTS("${X11_LIBRARIES}" "XOpenDisplay" "${X11_LIBRARY_DIR}" X11_LIB_X11_SOLO) - IF(NOT X11_LIB_X11_SOLO) + if(not X11_LIB_X11_SOLO) # Find library needed for dnet_ntoa. CHECK_LIBRARY_EXISTS("dnet" "dnet_ntoa" "" X11_LIB_DNET_HAS_DNET_NTOA) - IF (X11_LIB_DNET_HAS_DNET_NTOA) - SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet) - ELSE (X11_LIB_DNET_HAS_DNET_NTOA) + if (X11_LIB_DNET_HAS_DNET_NTOA) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet) + else (X11_LIB_DNET_HAS_DNET_NTOA) CHECK_LIBRARY_EXISTS("dnet_stub" "dnet_ntoa" "" X11_LIB_DNET_STUB_HAS_DNET_NTOA) - IF (X11_LIB_DNET_STUB_HAS_DNET_NTOA) - SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub) - ENDIF (X11_LIB_DNET_STUB_HAS_DNET_NTOA) - ENDIF (X11_LIB_DNET_HAS_DNET_NTOA) - ENDIF(NOT X11_LIB_X11_SOLO) + if (X11_LIB_DNET_STUB_HAS_DNET_NTOA) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub) + endif (X11_LIB_DNET_STUB_HAS_DNET_NTOA) + endif (X11_LIB_DNET_HAS_DNET_NTOA) + endif(not X11_LIB_X11_SOLO) # Find library needed for gethostbyname. CHECK_FUNCTION_EXISTS("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME) - IF(NOT CMAKE_HAVE_GETHOSTBYNAME) + if(not CMAKE_HAVE_GETHOSTBYNAME) CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - IF (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl) - ELSE (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + if (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl) + else (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) CHECK_LIBRARY_EXISTS("bsd" "gethostbyname" "" CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) - IF (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) - SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd) - ENDIF (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) - ENDIF (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - ENDIF(NOT CMAKE_HAVE_GETHOSTBYNAME) + if (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd) + endif (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) + endif (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + endif(not CMAKE_HAVE_GETHOSTBYNAME) # Find library needed for connect. CHECK_FUNCTION_EXISTS("connect" CMAKE_HAVE_CONNECT) - IF(NOT CMAKE_HAVE_CONNECT) + if(not CMAKE_HAVE_CONNECT) CHECK_LIBRARY_EXISTS("socket" "connect" "" CMAKE_LIB_SOCKET_HAS_CONNECT) - IF (CMAKE_LIB_SOCKET_HAS_CONNECT) - SET (X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS}) - ENDIF (CMAKE_LIB_SOCKET_HAS_CONNECT) - ENDIF(NOT CMAKE_HAVE_CONNECT) + if (CMAKE_LIB_SOCKET_HAS_CONNECT) + set (X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS}) + endif (CMAKE_LIB_SOCKET_HAS_CONNECT) + endif(not CMAKE_HAVE_CONNECT) # Find library needed for remove. CHECK_FUNCTION_EXISTS("remove" CMAKE_HAVE_REMOVE) - IF(NOT CMAKE_HAVE_REMOVE) + if(not CMAKE_HAVE_REMOVE) CHECK_LIBRARY_EXISTS("posix" "remove" "" CMAKE_LIB_POSIX_HAS_REMOVE) - IF (CMAKE_LIB_POSIX_HAS_REMOVE) - SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix) - ENDIF (CMAKE_LIB_POSIX_HAS_REMOVE) - ENDIF(NOT CMAKE_HAVE_REMOVE) + if (CMAKE_LIB_POSIX_HAS_REMOVE) + set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix) + endif (CMAKE_LIB_POSIX_HAS_REMOVE) + endif(not CMAKE_HAVE_REMOVE) # Find library needed for shmat. CHECK_FUNCTION_EXISTS("shmat" CMAKE_HAVE_SHMAT) - IF(NOT CMAKE_HAVE_SHMAT) + if(not CMAKE_HAVE_SHMAT) CHECK_LIBRARY_EXISTS("ipc" "shmat" "" CMAKE_LIB_IPS_HAS_SHMAT) - 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$") + 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$") 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 -lICE) - ENDIF(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) + if(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) + set (X11_X_PRE_LIBS -lSM -lICE) + endif(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) # Build the final list of libraries. - SET (X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS}) - ENDIF(X11_FOUND) + set (X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS}) + endif(X11_FOUND) MARK_AS_ADVANCED( X11_X11_INCLUDE_PATH @@ -148,4 +148,4 @@ IF (UNIX) X11_LIBRARIES ) -ENDIF (UNIX) +endif (UNIX) -- cgit v1.2.1 From eaad615ee85800bedbf2088326399027c95d0740 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 15 Feb 2006 10:49:53 +0000 Subject: Hmm, "NOT" can't be lowercased. I tested before lowercasing that last one, of course... svn path=/trunk/KDE/kdelibs/; revision=509625 --- modules/FindX11.cmake | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index f0e61210..19c85804 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -75,7 +75,7 @@ if (UNIX) # See if XOpenDisplay in X11 works by itself. CHECK_LIBRARY_EXISTS("${X11_LIBRARIES}" "XOpenDisplay" "${X11_LIBRARY_DIR}" X11_LIB_X11_SOLO) - if(not X11_LIB_X11_SOLO) + if(NOT X11_LIB_X11_SOLO) # Find library needed for dnet_ntoa. CHECK_LIBRARY_EXISTS("dnet" "dnet_ntoa" "" X11_LIB_DNET_HAS_DNET_NTOA) if (X11_LIB_DNET_HAS_DNET_NTOA) @@ -86,11 +86,11 @@ if (UNIX) set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub) endif (X11_LIB_DNET_STUB_HAS_DNET_NTOA) endif (X11_LIB_DNET_HAS_DNET_NTOA) - endif(not X11_LIB_X11_SOLO) + endif(NOT X11_LIB_X11_SOLO) # Find library needed for gethostbyname. CHECK_FUNCTION_EXISTS("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME) - if(not CMAKE_HAVE_GETHOSTBYNAME) + if(NOT CMAKE_HAVE_GETHOSTBYNAME) CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) if (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl) @@ -100,34 +100,34 @@ if (UNIX) set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd) endif (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) endif (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - endif(not CMAKE_HAVE_GETHOSTBYNAME) + endif(NOT CMAKE_HAVE_GETHOSTBYNAME) # Find library needed for connect. CHECK_FUNCTION_EXISTS("connect" CMAKE_HAVE_CONNECT) - if(not CMAKE_HAVE_CONNECT) + if(NOT CMAKE_HAVE_CONNECT) CHECK_LIBRARY_EXISTS("socket" "connect" "" CMAKE_LIB_SOCKET_HAS_CONNECT) if (CMAKE_LIB_SOCKET_HAS_CONNECT) set (X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS}) endif (CMAKE_LIB_SOCKET_HAS_CONNECT) - endif(not CMAKE_HAVE_CONNECT) + endif(NOT CMAKE_HAVE_CONNECT) # Find library needed for remove. CHECK_FUNCTION_EXISTS("remove" CMAKE_HAVE_REMOVE) - if(not CMAKE_HAVE_REMOVE) + if(NOT CMAKE_HAVE_REMOVE) CHECK_LIBRARY_EXISTS("posix" "remove" "" CMAKE_LIB_POSIX_HAS_REMOVE) if (CMAKE_LIB_POSIX_HAS_REMOVE) set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix) endif (CMAKE_LIB_POSIX_HAS_REMOVE) - endif(not CMAKE_HAVE_REMOVE) + endif(NOT CMAKE_HAVE_REMOVE) # Find library needed for shmat. CHECK_FUNCTION_EXISTS("shmat" CMAKE_HAVE_SHMAT) - if(not CMAKE_HAVE_SHMAT) + if(NOT CMAKE_HAVE_SHMAT) CHECK_LIBRARY_EXISTS("ipc" "shmat" "" CMAKE_LIB_IPS_HAS_SHMAT) 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(NOT CMAKE_HAVE_SHMAT) endif($ENV{ISC} MATCHES "^yes$") CHECK_LIBRARY_EXISTS("ICE" "IceConnectionNumber" "${X11_LIBRARY_DIR}" -- cgit v1.2.1 From e0f9d000f61a36aac107ff17a4e3838aa82ed770 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 17 Feb 2006 09:15:41 +0000 Subject: For the future (in kdebase don't duplicate search directory) svn path=/trunk/KDE/kdelibs/; revision=510422 --- modules/FindX11.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 19c85804..2e1095ac 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -27,6 +27,7 @@ if (UNIX) FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xlib_INCLUDE_PATH X11/Xlib.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xaccess_INCLUDE_PATH X11/extensions/XKBstr.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) @@ -50,6 +51,10 @@ if (UNIX) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) endif(X11_Xext_LIB) + if(X11_Xaccess_INCLUDE_PATH) + set(X11_Xaccess_FOUND TRUE) + endif(X11_Xaccess_INCLUDE_PATH) + # Deprecated variable for backwards compatibility with CMake 1.4 if(X11_X11_INCLUDE_PATH) if(X11_LIBRARIES) -- cgit v1.2.1 From 92d4f57a20e1fde9539371cbcd537e6bd6a9c6de Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 23 Feb 2006 09:43:02 +0000 Subject: Search X11 extension module svn path=/trunk/KDE/kdelibs/; revision=512668 --- modules/FindX11.cmake | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 2e1095ac..95ad6a6e 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -28,8 +28,12 @@ if (UNIX) FIND_PATH(X11_Xlib_INCLUDE_PATH X11/Xlib.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xaccess_INCLUDE_PATH X11/extensions/XKBstr.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH}) if(X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -54,7 +58,15 @@ if (UNIX) if(X11_Xaccess_INCLUDE_PATH) set(X11_Xaccess_FOUND TRUE) endif(X11_Xaccess_INCLUDE_PATH) - + + if(X11_Xcomposite_INCLUDE_PATH) + set(X11_Xcomposite_FOUND TRUE) + endif(X11_Xcomposite_INCLUDE_PATH) + + if(X11_Xfixes_INCLUDE_PATH) + set(X11_Xfixes_FOUND TRUE) + endif(X11_Xfixes_INCLUDE_PATH) + # Deprecated variable for backwards compatibility with CMake 1.4 if(X11_X11_INCLUDE_PATH) if(X11_LIBRARIES) @@ -150,6 +162,11 @@ if (UNIX) X11_Xext_LIB X11_Xlib_INCLUDE_PATH X11_Xutil_INCLUDE_PATH + X11_Xcomposite_INCLUDE_PATH + X11_Xcomposite_LIB + X11_Xaccess_INCLUDE_PATH + X11_Xfixes_LIB + X11_Xfixes_INCLUDE_PATH X11_LIBRARIES ) -- cgit v1.2.1 From 017f409c18a2c7e0f741261e8cfc10f1b2c7c559 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 23 Feb 2006 09:54:57 +0000 Subject: Search other x11 extension svn path=/trunk/KDE/kdelibs/; revision=512674 --- modules/FindX11.cmake | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 95ad6a6e..83eafc8c 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -30,10 +30,15 @@ if (UNIX) FIND_PATH(X11_Xaccess_INCLUDE_PATH X11/extensions/XKBstr.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH}) if(X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -67,6 +72,14 @@ if (UNIX) set(X11_Xfixes_FOUND TRUE) endif(X11_Xfixes_INCLUDE_PATH) + if(X11_Xrandr_INCLUDE_PATH) + set(X11_Xrandr_FOUND TRUE) + endif(X11_Xrandr_INCLUDE_PATH) + + if(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) + set(X11_kompmgr_FOUND TRUE) + endif(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) + # Deprecated variable for backwards compatibility with CMake 1.4 if(X11_X11_INCLUDE_PATH) if(X11_LIBRARIES) @@ -167,6 +180,12 @@ if (UNIX) X11_Xaccess_INCLUDE_PATH X11_Xfixes_LIB X11_Xfixes_INCLUDE_PATH + X11_Xrandr_LIB + X11_Xrandr_INCLUDE_PATH + X11_Xdamage_LIB + X11_Xdamage_INCLUDE_PATH + X11_Xrender_LIB + X11_Xrender_INCLUDE_PATH X11_LIBRARIES ) -- cgit v1.2.1 From f9aeebbc8f6aafa913b75bca4aef70f89883376e Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 23 Feb 2006 10:06:58 +0000 Subject: Again other X11 extension (need for future) svn path=/trunk/KDE/kdelibs/; revision=512677 --- modules/FindX11.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 83eafc8c..13451fa2 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -33,12 +33,14 @@ if (UNIX) FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xf86misc_INCLUDE_PATH X11/extensions/xf86misc.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH}) if(X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -76,6 +78,10 @@ if (UNIX) set(X11_Xrandr_FOUND TRUE) endif(X11_Xrandr_INCLUDE_PATH) + if(X11_Xxf86misc_INCLUDE_PATH) + set(X11_Xxf86misc_FOUND TRUE) + endif(X11_Xxf86misc_INCLUDE_PATH) + if(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) set(X11_kompmgr_FOUND TRUE) endif(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) @@ -186,6 +192,8 @@ if (UNIX) X11_Xdamage_INCLUDE_PATH X11_Xrender_LIB X11_Xrender_INCLUDE_PATH + X11_Xxf86misc_LIB + X11_Xxf86misc_INCLUDE_PATH X11_LIBRARIES ) -- cgit v1.2.1 From 18ef27a380f366e9afa8aea2df116171eb547b30 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 23 Feb 2006 13:34:35 +0000 Subject: Fix search xkb extension svn path=/trunk/KDE/kdelibs/; revision=512735 --- modules/FindX11.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 13451fa2..facc99e4 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -27,7 +27,9 @@ if (UNIX) FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xlib_INCLUDE_PATH X11/Xlib.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xaccess_INCLUDE_PATH X11/extensions/XKBstr.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xaccessstr_INCLUDE_PATH X11/extensions/XKBstr.h ${X11_INC_SEARCH_PATH}) +#Solaris lacks this file, so we should skip kxkbd here + FIND_PATH(X11_Xaccessrules_INCLUDE_PATH X11/extensions/XKBrules.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h ${X11_INC_SEARCH_PATH}) @@ -62,9 +64,10 @@ if (UNIX) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) endif(X11_Xext_LIB) - if(X11_Xaccess_INCLUDE_PATH) + if(X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) set(X11_Xaccess_FOUND TRUE) - endif(X11_Xaccess_INCLUDE_PATH) + set(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH}) + endif(X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) if(X11_Xcomposite_INCLUDE_PATH) set(X11_Xcomposite_FOUND TRUE) -- cgit v1.2.1 From 5afaf55ab9625215b2237215d6b7003aa91d5739 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 23 Feb 2006 14:20:16 +0000 Subject: Search xinerama extension svn path=/trunk/KDE/kdelibs/; revision=512744 --- modules/FindX11.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index facc99e4..3adfe510 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -36,6 +36,7 @@ if (UNIX) FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xf86misc_INCLUDE_PATH X11/extensions/xf86misc.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) @@ -43,6 +44,7 @@ if (UNIX) FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}) if(X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -73,6 +75,10 @@ if (UNIX) set(X11_Xcomposite_FOUND TRUE) endif(X11_Xcomposite_INCLUDE_PATH) + if(X11_Xinerama_INCLUDE_PATH) + set(X11_Xinerama_FOUND TRUE) + endif(X11_Xinerama_INCLUDE_PATH) + if(X11_Xfixes_INCLUDE_PATH) set(X11_Xfixes_FOUND TRUE) endif(X11_Xfixes_INCLUDE_PATH) @@ -197,6 +203,8 @@ if (UNIX) X11_Xrender_INCLUDE_PATH X11_Xxf86misc_LIB X11_Xxf86misc_INCLUDE_PATH + X11_Xinerama_LIB + X11_Xinerama_INCLUDE_PATH X11_LIBRARIES ) -- cgit v1.2.1 From c07e6dee7fc8796271e8697ed742e7e0514d643f Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 25 Feb 2006 15:43:23 +0000 Subject: Add other X11 test (Xcursor/XTest) svn path=/trunk/KDE/kdelibs/; revision=513554 --- modules/FindX11.cmake | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 3adfe510..79e43bf4 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -37,6 +37,8 @@ if (UNIX) FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xf86misc_INCLUDE_PATH X11/extensions/xf86misc.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) @@ -45,6 +47,8 @@ if (UNIX) FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH}) if(X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -75,6 +79,10 @@ if (UNIX) set(X11_Xcomposite_FOUND TRUE) endif(X11_Xcomposite_INCLUDE_PATH) + if(X11_XTest_INCLUDE_PATH) + set(X11_XTest_FOUND TRUE) + endif(X11_XTest_INCLUDE_PATH) + if(X11_Xinerama_INCLUDE_PATH) set(X11_Xinerama_FOUND TRUE) endif(X11_Xinerama_INCLUDE_PATH) @@ -91,6 +99,10 @@ if (UNIX) set(X11_Xxf86misc_FOUND TRUE) endif(X11_Xxf86misc_INCLUDE_PATH) + if(X11_Xcursor_INCLUDE_PATH) + set(X11_Xcursor_FOUND TRUE) + endif(X11_Xcursor_INCLUDE_PATH) + if(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) set(X11_kompmgr_FOUND TRUE) endif(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) @@ -205,6 +217,10 @@ if (UNIX) X11_Xxf86misc_INCLUDE_PATH X11_Xinerama_LIB X11_Xinerama_INCLUDE_PATH + X11_XTest_LIB + X11_XTest_INCLUDE_PATH + X11_Xcursor_LIB + X11_Xcursor_INCLUDE_PATH X11_LIBRARIES ) -- cgit v1.2.1 From 11073b50b46982ba2507e0dafe33d9af2bf1bc99 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 2 Mar 2006 14:50:35 +0000 Subject: Search libXt svn path=/trunk/KDE/kdelibs/; revision=515065 --- modules/FindX11.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 79e43bf4..02f5d43c 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -49,6 +49,7 @@ if (UNIX) FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH}) if(X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -221,6 +222,7 @@ if (UNIX) X11_XTest_INCLUDE_PATH X11_Xcursor_LIB X11_Xcursor_INCLUDE_PATH + X11_Xt_LIB X11_LIBRARIES ) -- cgit v1.2.1 From e74de06077769fde12ace460d1043ad233f68c36 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 3 Mar 2006 11:04:50 +0000 Subject: Detect Xscreensaver extension svn path=/trunk/KDE/kdelibs/; revision=515293 --- modules/FindX11.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 02f5d43c..a14a1904 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -39,6 +39,7 @@ if (UNIX) FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) @@ -104,6 +105,10 @@ if (UNIX) set(X11_Xcursor_FOUND TRUE) endif(X11_Xcursor_INCLUDE_PATH) + if(X11_Xscreensaver_INCLUDE_PATH) + set(X11_Xscreensaver_FOUND TRUE) + endif(X11_Xscreensaver_INCLUDE_PATH) + if(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) set(X11_kompmgr_FOUND TRUE) endif(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) -- cgit v1.2.1 From 8b05e84f1cd212fe8101ee7ad56a495bca107941 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 3 Mar 2006 16:26:07 +0000 Subject: Search dpms extension (need to improve it) svn path=/trunk/KDE/kdelibs/; revision=515395 --- modules/FindX11.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index a14a1904..a558c982 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -40,6 +40,7 @@ if (UNIX) FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h ${X11_INC_SEARCH_PATH}) 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_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) @@ -109,6 +110,10 @@ if (UNIX) set(X11_Xscreensaver_FOUND TRUE) endif(X11_Xscreensaver_INCLUDE_PATH) + if(X11_dpms_INCLUDE_PATH) + set(X11_dpms_FOUND TRUE) + endif(X11_dpms_INCLUDE_PATH) + if(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) set(X11_kompmgr_FOUND TRUE) endif(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) @@ -227,6 +232,7 @@ if (UNIX) X11_XTest_INCLUDE_PATH X11_Xcursor_LIB X11_Xcursor_INCLUDE_PATH + X11_dpms_INCLUDE_PATH X11_Xt_LIB X11_LIBRARIES ) -- cgit v1.2.1 From 200f848a4b2964fabe89192b8fd05d300f08af31 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 5 Mar 2006 10:10:28 +0000 Subject: Search Xss extension (not perfect) svn path=/trunk/KDE/kdelibs/; revision=515896 --- modules/FindX11.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index a558c982..6e7e4c7c 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -43,6 +43,7 @@ if (UNIX) FIND_PATH(X11_dpms_INCLUDE_PATH X11/extensions/dpms.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xss_LIB Xss ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH}) @@ -234,6 +235,7 @@ if (UNIX) X11_Xcursor_INCLUDE_PATH X11_dpms_INCLUDE_PATH X11_Xt_LIB + X11_Xss_LIB X11_LIBRARIES ) -- cgit v1.2.1 From 196aae84d9e0dda2dd9aecdf64e809ab447eface Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 6 Mar 2006 12:55:50 +0000 Subject: Search Xkb svn path=/trunk/KDE/kdelibs/; revision=516249 --- modules/FindX11.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 6e7e4c7c..b1ae0b0f 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -41,9 +41,11 @@ if (UNIX) FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h ${X11_INC_SEARCH_PATH}) 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_Xkblib_INCLUDE_PATH X11/XKBlib.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}) - FIND_LIBRARY(X11_Xss_LIB Xss ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH}) @@ -115,6 +117,10 @@ if (UNIX) set(X11_dpms_FOUND TRUE) endif(X11_dpms_INCLUDE_PATH) + if( X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) + set(X11_Xkb_FOUND TRUE) + endif( X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) + if(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) set(X11_kompmgr_FOUND TRUE) endif(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) -- cgit v1.2.1 From 37e7931251c36b4c195b08be14864926a02276ac Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 7 Mar 2006 12:41:37 +0000 Subject: Search Xau lib svn path=/trunk/KDE/kdelibs/; revision=516496 --- modules/FindX11.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index b1ae0b0f..5f956ea9 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -52,9 +52,10 @@ if (UNIX) FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}) - FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11XTest_LIB Xtst ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH}) if(X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -62,7 +63,7 @@ if (UNIX) if(X11_Xlib_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xlib_INCLUDE_PATH}) - endif(X11_Xlib_INCLUDE_PATH) + endif(X11_Xlib_INCLUDE_PATH) if(X11_Xutil_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xutil_INCLUDE_PATH}) @@ -76,6 +77,11 @@ if (UNIX) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) endif(X11_Xext_LIB) + if(X11_Xau_LIB) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) + set(X11_Xau_FOUND TRUE) + endif(X11_Xau_LIB) + if(X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) set(X11_Xaccess_FOUND TRUE) set(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH}) @@ -218,6 +224,7 @@ if (UNIX) X11_X11_INCLUDE_PATH X11_X11_LIB X11_Xext_LIB + X11_Xau_LIB X11_Xlib_INCLUDE_PATH X11_Xutil_INCLUDE_PATH X11_Xcomposite_INCLUDE_PATH -- cgit v1.2.1 From b06955eeb4d577da65b52c8a0d68602be790571f Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 7 Mar 2006 12:46:04 +0000 Subject: oops typo svn path=/trunk/KDE/kdelibs/; revision=516499 --- modules/FindX11.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 5f956ea9..c86e7b56 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -52,7 +52,7 @@ if (UNIX) FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}) - FIND_LIBRARY(X11XTest_LIB Xtst ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH}) -- cgit v1.2.1 From c93f4903f1b3daa7f4fa6aa12430f19efa79703a Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 7 Mar 2006 13:36:00 +0000 Subject: Search Xdmcp svn path=/trunk/KDE/kdelibs/; revision=516520 --- modules/FindX11.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index c86e7b56..d936f8af 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -43,6 +43,7 @@ if (UNIX) 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_Xkblib_INCLUDE_PATH X11/XKBlib.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.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}) @@ -56,6 +57,7 @@ if (UNIX) FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH}) 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}) if(X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -81,7 +83,12 @@ if (UNIX) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) set(X11_Xau_FOUND TRUE) endif(X11_Xau_LIB) - + + if(X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xdmcp_LIB}) + set(X11_Xdmcp_FOUND TRUE) + endif(X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) + if(X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) set(X11_Xaccess_FOUND TRUE) set(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH}) @@ -249,6 +256,7 @@ if (UNIX) X11_dpms_INCLUDE_PATH X11_Xt_LIB X11_Xss_LIB + X11_Xdmcp_LIB X11_LIBRARIES ) -- cgit v1.2.1 From 0d23993a1839f3e2e603d9791a6d5d5b08586911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Larouche?= Date: Fri, 17 Mar 2006 13:38:43 +0000 Subject: Forward port of: Actually set X11_Xrender_LIB correctly svn path=/trunk/KDE/kdelibs/; revision=519550 --- modules/FindX11.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index d936f8af..958f7659 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -50,6 +50,7 @@ if (UNIX) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}) @@ -110,6 +111,10 @@ if (UNIX) set(X11_Xfixes_FOUND TRUE) endif(X11_Xfixes_INCLUDE_PATH) + if(X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB) + set(X11_Xrender_FOUND TRUE) + endif(X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB) + if(X11_Xrandr_INCLUDE_PATH) set(X11_Xrandr_FOUND TRUE) endif(X11_Xrandr_INCLUDE_PATH) -- cgit v1.2.1 From fa505bcd71b8cf027f02d90c6cd52a8853cd7c22 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 18 Mar 2006 17:42:49 +0000 Subject: -mark more variables as advanced, so that they don't clutter the default ccmake display Alex svn path=/trunk/KDE/kdelibs/; revision=520056 --- modules/FindX11.cmake | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 958f7659..867761b2 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -236,11 +236,11 @@ if (UNIX) X11_X11_INCLUDE_PATH X11_X11_LIB X11_Xext_LIB - X11_Xau_LIB + X11_Xau_LIB X11_Xlib_INCLUDE_PATH X11_Xutil_INCLUDE_PATH X11_Xcomposite_INCLUDE_PATH - X11_Xcomposite_LIB + X11_Xcomposite_LIB X11_Xaccess_INCLUDE_PATH X11_Xfixes_LIB X11_Xfixes_INCLUDE_PATH @@ -250,19 +250,26 @@ if (UNIX) X11_Xdamage_INCLUDE_PATH X11_Xrender_LIB X11_Xrender_INCLUDE_PATH - X11_Xxf86misc_LIB - X11_Xxf86misc_INCLUDE_PATH - X11_Xinerama_LIB - X11_Xinerama_INCLUDE_PATH + X11_Xxf86misc_LIB + X11_Xxf86misc_INCLUDE_PATH + X11_Xinerama_LIB + X11_Xinerama_INCLUDE_PATH X11_XTest_LIB X11_XTest_INCLUDE_PATH X11_Xcursor_LIB X11_Xcursor_INCLUDE_PATH - X11_dpms_INCLUDE_PATH - X11_Xt_LIB - X11_Xss_LIB - X11_Xdmcp_LIB + X11_dpms_INCLUDE_PATH + X11_Xt_LIB + X11_Xss_LIB + X11_Xdmcp_LIB X11_LIBRARIES + X11_Xaccessrules_INCLUDE_PATH + X11_Xaccessstr_INCLUDE_PATH + X11_Xdmcp_INCLUDE_PATH + X11_Xf86misc_INCLUDE_PATH + X11_Xkb_INCLUDE_PATH + X11_Xkblib_INCLUDE_PATH + X11_Xscreensaver_INCLUDE_PATH ) endif (UNIX) -- cgit v1.2.1 From 191846e3e21c697c28bd5c8a166edeb4072161e3 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 20 Mar 2006 21:05:37 +0000 Subject: minor cleanups: indenting, adding newline to end of file, etc. svn path=/trunk/KDE/kdelibs/; revision=520790 --- modules/FindX11.cmake | 146 +++++++++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 73 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 867761b2..9c6b1803 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -60,177 +60,177 @@ if (UNIX) FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH}) - if(X11_X11_INCLUDE_PATH) + if (X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) - endif(X11_X11_INCLUDE_PATH) + endif (X11_X11_INCLUDE_PATH) - if(X11_Xlib_INCLUDE_PATH) + if (X11_Xlib_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xlib_INCLUDE_PATH}) - endif(X11_Xlib_INCLUDE_PATH) + endif (X11_Xlib_INCLUDE_PATH) - if(X11_Xutil_INCLUDE_PATH) + if (X11_Xutil_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xutil_INCLUDE_PATH}) - endif(X11_Xutil_INCLUDE_PATH) + endif (X11_Xutil_INCLUDE_PATH) - if(X11_X11_LIB) + if (X11_X11_LIB) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_X11_LIB}) - endif(X11_X11_LIB) + endif (X11_X11_LIB) - if(X11_Xext_LIB) + if (X11_Xext_LIB) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) - endif(X11_Xext_LIB) + endif (X11_Xext_LIB) - if(X11_Xau_LIB) + if (X11_Xau_LIB) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) set(X11_Xau_FOUND TRUE) - endif(X11_Xau_LIB) + endif (X11_Xau_LIB) - if(X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) + if (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xdmcp_LIB}) set(X11_Xdmcp_FOUND TRUE) - endif(X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) + endif (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) - if(X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) + if (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) set(X11_Xaccess_FOUND TRUE) set(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH}) - endif(X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) + endif (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) - if(X11_Xcomposite_INCLUDE_PATH) + if (X11_Xcomposite_INCLUDE_PATH) set(X11_Xcomposite_FOUND TRUE) - endif(X11_Xcomposite_INCLUDE_PATH) + endif (X11_Xcomposite_INCLUDE_PATH) - if(X11_XTest_INCLUDE_PATH) + if (X11_XTest_INCLUDE_PATH) set(X11_XTest_FOUND TRUE) - endif(X11_XTest_INCLUDE_PATH) + endif (X11_XTest_INCLUDE_PATH) - if(X11_Xinerama_INCLUDE_PATH) + if (X11_Xinerama_INCLUDE_PATH) set(X11_Xinerama_FOUND TRUE) - endif(X11_Xinerama_INCLUDE_PATH) + endif (X11_Xinerama_INCLUDE_PATH) - if(X11_Xfixes_INCLUDE_PATH) + if (X11_Xfixes_INCLUDE_PATH) set(X11_Xfixes_FOUND TRUE) - endif(X11_Xfixes_INCLUDE_PATH) + endif (X11_Xfixes_INCLUDE_PATH) - if(X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB) + if (X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB) set(X11_Xrender_FOUND TRUE) - endif(X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB) + endif (X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB) - if(X11_Xrandr_INCLUDE_PATH) + if (X11_Xrandr_INCLUDE_PATH) set(X11_Xrandr_FOUND TRUE) - endif(X11_Xrandr_INCLUDE_PATH) + endif (X11_Xrandr_INCLUDE_PATH) - if(X11_Xxf86misc_INCLUDE_PATH) + if (X11_Xxf86misc_INCLUDE_PATH) set(X11_Xxf86misc_FOUND TRUE) - endif(X11_Xxf86misc_INCLUDE_PATH) + endif (X11_Xxf86misc_INCLUDE_PATH) - if(X11_Xcursor_INCLUDE_PATH) + if (X11_Xcursor_INCLUDE_PATH) set(X11_Xcursor_FOUND TRUE) - endif(X11_Xcursor_INCLUDE_PATH) + endif (X11_Xcursor_INCLUDE_PATH) - if(X11_Xscreensaver_INCLUDE_PATH) + if (X11_Xscreensaver_INCLUDE_PATH) set(X11_Xscreensaver_FOUND TRUE) - endif(X11_Xscreensaver_INCLUDE_PATH) + endif (X11_Xscreensaver_INCLUDE_PATH) - if(X11_dpms_INCLUDE_PATH) + if (X11_dpms_INCLUDE_PATH) set(X11_dpms_FOUND TRUE) - endif(X11_dpms_INCLUDE_PATH) + endif (X11_dpms_INCLUDE_PATH) - if( X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) + if (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) set(X11_Xkb_FOUND TRUE) - endif( X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) + endif (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) - if(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) + if (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) set(X11_kompmgr_FOUND TRUE) - endif(X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) + endif (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) # Deprecated variable for backwards compatibility with CMake 1.4 - if(X11_X11_INCLUDE_PATH) - if(X11_LIBRARIES) + if (X11_X11_INCLUDE_PATH) + if (X11_LIBRARIES) set(X11_FOUND 1) - endif(X11_LIBRARIES) - endif(X11_X11_INCLUDE_PATH) + endif (X11_LIBRARIES) + endif (X11_X11_INCLUDE_PATH) set(X11_LIBRARY_DIR "") - if(X11_X11_LIB) + if (X11_X11_LIB) GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH) - endif(X11_X11_LIB) + endif (X11_X11_LIB) - if(X11_FOUND) + if (X11_FOUND) INCLUDE(CheckFunctionExists) INCLUDE(CheckLibraryExists) # Translated from an autoconf-generated configure script. # See libs.m4 in autoconf's m4 directory. - if($ENV{ISC} MATCHES "^yes$") + if ($ENV{ISC} MATCHES "^yes$") set(X11_X_EXTRA_LIBS -lnsl_s -linet) - else($ENV{ISC} MATCHES "^yes$") + else ($ENV{ISC} MATCHES "^yes$") set(X11_X_EXTRA_LIBS "") # See if XOpenDisplay in X11 works by itself. CHECK_LIBRARY_EXISTS("${X11_LIBRARIES}" "XOpenDisplay" "${X11_LIBRARY_DIR}" X11_LIB_X11_SOLO) - if(NOT X11_LIB_X11_SOLO) + if (NOT X11_LIB_X11_SOLO) # Find library needed for dnet_ntoa. CHECK_LIBRARY_EXISTS("dnet" "dnet_ntoa" "" X11_LIB_DNET_HAS_DNET_NTOA) if (X11_LIB_DNET_HAS_DNET_NTOA) - set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet) + set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet) else (X11_LIB_DNET_HAS_DNET_NTOA) CHECK_LIBRARY_EXISTS("dnet_stub" "dnet_ntoa" "" X11_LIB_DNET_STUB_HAS_DNET_NTOA) if (X11_LIB_DNET_STUB_HAS_DNET_NTOA) - set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub) + set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub) endif (X11_LIB_DNET_STUB_HAS_DNET_NTOA) endif (X11_LIB_DNET_HAS_DNET_NTOA) - endif(NOT X11_LIB_X11_SOLO) + endif (NOT X11_LIB_X11_SOLO) # Find library needed for gethostbyname. CHECK_FUNCTION_EXISTS("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME) - if(NOT CMAKE_HAVE_GETHOSTBYNAME) + if (NOT CMAKE_HAVE_GETHOSTBYNAME) CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) if (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl) + set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl) else (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) CHECK_LIBRARY_EXISTS("bsd" "gethostbyname" "" CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) if (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) - set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd) + set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd) endif (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) endif (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - endif(NOT CMAKE_HAVE_GETHOSTBYNAME) + endif (NOT CMAKE_HAVE_GETHOSTBYNAME) # Find library needed for connect. CHECK_FUNCTION_EXISTS("connect" CMAKE_HAVE_CONNECT) - if(NOT CMAKE_HAVE_CONNECT) + if (NOT CMAKE_HAVE_CONNECT) CHECK_LIBRARY_EXISTS("socket" "connect" "" CMAKE_LIB_SOCKET_HAS_CONNECT) if (CMAKE_LIB_SOCKET_HAS_CONNECT) - set (X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS}) + set(X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS}) endif (CMAKE_LIB_SOCKET_HAS_CONNECT) - endif(NOT CMAKE_HAVE_CONNECT) + endif (NOT CMAKE_HAVE_CONNECT) # Find library needed for remove. CHECK_FUNCTION_EXISTS("remove" CMAKE_HAVE_REMOVE) - if(NOT CMAKE_HAVE_REMOVE) + if (NOT CMAKE_HAVE_REMOVE) CHECK_LIBRARY_EXISTS("posix" "remove" "" CMAKE_LIB_POSIX_HAS_REMOVE) if (CMAKE_LIB_POSIX_HAS_REMOVE) - set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix) + set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix) endif (CMAKE_LIB_POSIX_HAS_REMOVE) - endif(NOT CMAKE_HAVE_REMOVE) + endif (NOT CMAKE_HAVE_REMOVE) # Find library needed for shmat. CHECK_FUNCTION_EXISTS("shmat" CMAKE_HAVE_SHMAT) - if(NOT CMAKE_HAVE_SHMAT) + if (NOT CMAKE_HAVE_SHMAT) CHECK_LIBRARY_EXISTS("ipc" "shmat" "" CMAKE_LIB_IPS_HAS_SHMAT) if (CMAKE_LIB_IPS_HAS_SHMAT) - set (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lipc) + 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$") 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 -lICE) - endif(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) + if (CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) + set(X11_X_PRE_LIBS -lSM -lICE) + endif (CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) # Build the final list of libraries. - set (X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS}) - endif(X11_FOUND) + set(X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS}) + endif (X11_FOUND) MARK_AS_ADVANCED( X11_X11_INCLUDE_PATH @@ -270,6 +270,6 @@ if (UNIX) X11_Xkb_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH X11_Xscreensaver_INCLUDE_PATH - ) + ) endif (UNIX) -- cgit v1.2.1 From 341219afc6524c41755b981c45e593a30dc9da5a Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 24 Mar 2006 10:24:44 +0000 Subject: Search for xpm svn path=/trunk/KDE/kdelibs/; revision=522055 --- modules/FindX11.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'modules/FindX11.cmake') 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) -- cgit v1.2.1 From 4a357c445c9a8103fccb30e1f9fd48cd259d4a5e Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 29 Mar 2006 20:33:10 +0000 Subject: -add the include paths of all X11 extensions to X11_INCLUDE_PATH, so they don't have to be added everywhere manually X11_INCLUDE_PATH is part of KDE4_INCLUDES on UNIX != OS X CCMAIL: montel@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=524151 --- modules/FindX11.cmake | 56 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 21 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 167019fc..da103933 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -83,73 +83,87 @@ if (UNIX) endif (X11_Xext_LIB) if (X11_Xau_LIB) - set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) - set(X11_Xau_FOUND TRUE) + set(X11_Xau_FOUND TRUE) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) endif (X11_Xau_LIB) if (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) - set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xdmcp_LIB}) - set(X11_Xdmcp_FOUND TRUE) + set(X11_Xdmcp_FOUND TRUE) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xdmcp_LIB}) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdmcp_INCLUDE_PATH}) endif (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) if (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) - set(X11_Xaccess_FOUND TRUE) - set(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH}) + set(X11_Xaccess_FOUND TRUE) + set(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH}) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xaccess_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) + set(X11_Xpm_FOUND TRUE) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xpm_LIB}) + 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) - set(X11_Xcomposite_FOUND TRUE) + set(X11_Xcomposite_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcomposite_INCLUDE_PATH}) endif (X11_Xcomposite_INCLUDE_PATH) if (X11_XTest_INCLUDE_PATH) - set(X11_XTest_FOUND TRUE) + set(X11_XTest_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XTest_INCLUDE_PATH}) endif (X11_XTest_INCLUDE_PATH) if (X11_Xinerama_INCLUDE_PATH) - set(X11_Xinerama_FOUND TRUE) + set(X11_Xinerama_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinerama_INCLUDE_PATH}) endif (X11_Xinerama_INCLUDE_PATH) if (X11_Xfixes_INCLUDE_PATH) - set(X11_Xfixes_FOUND TRUE) + set(X11_Xfixes_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xfixes_INCLUDE_PATH}) endif (X11_Xfixes_INCLUDE_PATH) if (X11_Xrender_INCLUDE_PATH AND X11_Xrender_LIB) - set(X11_Xrender_FOUND TRUE) + 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) - set(X11_Xrandr_FOUND TRUE) + set(X11_Xrandr_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xrandr_INCLUDE_PATH}) endif (X11_Xrandr_INCLUDE_PATH) if (X11_Xxf86misc_INCLUDE_PATH) - set(X11_Xxf86misc_FOUND TRUE) + set(X11_Xxf86misc_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xxf86misc_INCLUDE_PATH}) endif (X11_Xxf86misc_INCLUDE_PATH) if (X11_Xcursor_INCLUDE_PATH) - set(X11_Xcursor_FOUND TRUE) + set(X11_Xcursor_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcursor_INCLUDE_PATH}) endif (X11_Xcursor_INCLUDE_PATH) if (X11_Xscreensaver_INCLUDE_PATH) - set(X11_Xscreensaver_FOUND TRUE) + set(X11_Xscreensaver_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xscreensaver_INCLUDE_PATH}) endif (X11_Xscreensaver_INCLUDE_PATH) if (X11_dpms_INCLUDE_PATH) - set(X11_dpms_FOUND TRUE) + set(X11_dpms_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_dpms_INCLUDE_PATH}) endif (X11_dpms_INCLUDE_PATH) if (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) - set(X11_Xkb_FOUND TRUE) + set(X11_Xkb_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xkb_INCLUDE_PATH} ) endif (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) if (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) - set(X11_kompmgr_FOUND TRUE) + set(X11_kompmgr_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdamage_INCLUDE_PATH}) endif (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) # Deprecated variable for backwards compatibility with CMake 1.4 -- cgit v1.2.1 From a1d53a7b0e72fc911d69c7225ae62cfc1f5d25bf Mon Sep 17 00:00:00 2001 From: Adrian Page Date: Sat, 8 Apr 2006 23:41:15 +0000 Subject: Add a check for Xinput. svn path=/trunk/KDE/kdelibs/; revision=527638 --- modules/FindX11.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index da103933..d6198f54 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -45,6 +45,7 @@ if (UNIX) 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_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.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}) @@ -61,6 +62,7 @@ if (UNIX) 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}) + FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH}) if (X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -166,6 +168,11 @@ if (UNIX) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdamage_INCLUDE_PATH}) endif (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) + if (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) + set(X11_Xinput_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput_INCLUDE_PATH}) + endif (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) + # Deprecated variable for backwards compatibility with CMake 1.4 if (X11_X11_INCLUDE_PATH) if (X11_LIBRARIES) @@ -295,6 +302,8 @@ if (UNIX) X11_Xscreensaver_INCLUDE_PATH X11_Xpm_INCLUDE_PATH X11_Xpm_LIB + X11_Xinput_LIB + X11_Xinput_INCLUDE_PATH ) endif (UNIX) -- cgit v1.2.1 From 32af729d84260c97a8274842cf74f53fd6206577 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 13 Apr 2006 06:48:39 +0000 Subject: Search Xft include lib svn path=/trunk/KDE/kdelibs/; revision=529324 --- modules/FindX11.cmake | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index d6198f54..ce9962cb 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -46,6 +46,7 @@ if (UNIX) 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_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.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}) @@ -63,7 +64,11 @@ if (UNIX) FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH}) 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}) endif (X11_X11_INCLUDE_PATH) @@ -84,6 +89,9 @@ if (UNIX) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) endif (X11_Xext_LIB) + if(X11_Xft_LIB) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xft_LIB}) + endif(X11_Xft_LIB) if (X11_Xau_LIB) set(X11_Xau_FOUND TRUE) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) @@ -304,6 +312,8 @@ if (UNIX) X11_Xpm_LIB X11_Xinput_LIB X11_Xinput_INCLUDE_PATH + X11_Xft_LIB + X11_Xft_INCLUDE_PATH ) endif (UNIX) -- cgit v1.2.1 From fd304842c000b155260bd22c2723b36fab4ccd20 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 13 Apr 2006 06:54:57 +0000 Subject: Add X11_XFT_FOUND svn path=/trunk/KDE/kdelibs/; revision=529328 --- modules/FindX11.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'modules/FindX11.cmake') 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}) -- cgit v1.2.1 From d6a1555c85db0d42158088737188d1c67df9c329 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 1 May 2006 13:34:37 +0000 Subject: If the header is there but not the lib, then we can't use it svn path=/trunk/KDE/kdelibs/; revision=536135 --- modules/FindX11.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index b3ba8af4..e5db8fed 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -121,10 +121,10 @@ if (UNIX) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcomposite_INCLUDE_PATH}) endif (X11_Xcomposite_INCLUDE_PATH) - if (X11_XTest_INCLUDE_PATH) + if (X11_XTest_INCLUDE_PATH AND X11_XTest_LIB) set(X11_XTest_FOUND TRUE) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XTest_INCLUDE_PATH}) - endif (X11_XTest_INCLUDE_PATH) + endif (X11_XTest_INCLUDE_PATH AND X11_XTest_LIB) if (X11_Xinerama_INCLUDE_PATH) set(X11_Xinerama_FOUND TRUE) -- cgit v1.2.1 From 6c41c0fc9389649b5dd63cbecac639daeff5d4ca Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 1 May 2006 14:19:49 +0000 Subject: It is quite faster when it doesn't search for libXrandr, libXft etc. in all of my $PATH. NO_SYSTEM_PATH disables looking into $PATH and $LIB, I don't see how a X lib could ever be in either of those. Windows uses $PATH for libs - but Windows doesn't have X11 so at least in this file this should be fine; I wonder why FIND_LIBRARY looks into $PATH on unix though, in general... CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=536154 --- modules/FindX11.cmake | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index e5db8fed..95854dc1 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -47,24 +47,24 @@ if (UNIX) FIND_PATH(X11_Xpm_INCLUDE_PATH X11/xpm.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.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}) - FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) - FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH}) - FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH}) - FIND_LIBRARY(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH}) - FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH}) - FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH}) - FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}) - FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH}) - FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH}) - 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}) - FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH}) - FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xss_LIB Xss ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${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_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + 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}) -- cgit v1.2.1 From 43f64601e1197c1dfc4a7437c98eec67df4aedf5 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 3 May 2006 10:15:12 +0000 Subject: If the lib isn't there, xcursor isn't useable. This should probably be done for all others... svn path=/trunk/KDE/kdelibs/; revision=536875 --- modules/FindX11.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 95854dc1..aea1a5f7 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -151,10 +151,10 @@ if (UNIX) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xxf86misc_INCLUDE_PATH}) endif (X11_Xxf86misc_INCLUDE_PATH) - if (X11_Xcursor_INCLUDE_PATH) + if (X11_Xcursor_INCLUDE_PATH AND X11_Xcursor_LIB) set(X11_Xcursor_FOUND TRUE) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcursor_INCLUDE_PATH}) - endif (X11_Xcursor_INCLUDE_PATH) + endif (X11_Xcursor_INCLUDE_PATH AND X11_Xcursor_LIB) if (X11_Xscreensaver_INCLUDE_PATH) set(X11_Xscreensaver_FOUND TRUE) -- cgit v1.2.1 From 2594b8f6ce971342f4f5b6ca4abe13c6acf05636 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 23 May 2006 17:28:42 +0000 Subject: Search shape for ksnapshot svn path=/trunk/KDE/kdelibs/; revision=544133 --- modules/FindX11.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'modules/FindX11.cmake') 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) -- cgit v1.2.1 From 0fcee18041e6ea53cc9989165ae04bb39ad34e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 4 Jul 2006 19:03:40 +0000 Subject: set X11_Xdamage_FOUND svn path=/trunk/KDE/kdelibs/; revision=558139 --- modules/FindX11.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index e9c3a3c0..1f759efe 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -127,6 +127,11 @@ if (UNIX) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcomposite_INCLUDE_PATH}) endif (X11_Xcomposite_INCLUDE_PATH) + if (X11_Xdamage_INCLUDE_PATH) + set(X11_Xdamage_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdamage_INCLUDE_PATH}) + endif (X11_Xdamage_INCLUDE_PATH) + if (X11_XTest_INCLUDE_PATH AND X11_XTest_LIB) set(X11_XTest_FOUND TRUE) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XTest_INCLUDE_PATH}) -- cgit v1.2.1 From 4e325797f8242fa03b9cc802f5b65224c730cac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 4 Jul 2006 22:49:51 +0000 Subject: kompmgr is soon gone svn path=/trunk/KDE/kdelibs/; revision=558238 --- modules/FindX11.cmake | 5 ----- 1 file changed, 5 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 1f759efe..6456e9e9 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -182,11 +182,6 @@ if (UNIX) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xkb_INCLUDE_PATH} ) endif (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) - if (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) - set(X11_kompmgr_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdamage_INCLUDE_PATH}) - endif (X11_Xdamage_INCLUDE_PATH AND X11_Xcomposite_INCLUDE_PATH AND X11_Xrender_INCLUDE_PATH) - if (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) set(X11_Xinput_FOUND TRUE) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput_INCLUDE_PATH}) -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/FindX11.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 6456e9e9..7bd3bde2 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -4,6 +4,9 @@ # X11_INCLUDE_DIR - include directories to use X11 # X11_LIBRARIES - link against these to use X11 +# Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. +# See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. + if (UNIX) set(X11_FOUND 0) -- cgit v1.2.1 From 7def509e808de513e1a66c57489ebb642eee8dcc Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Mon, 11 Sep 2006 11:21:06 +0000 Subject: find Xv svn path=/trunk/KDE/kdelibs/; revision=583023 --- modules/FindX11.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 7bd3bde2..4c314ef8 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -51,6 +51,7 @@ if (UNIX) FIND_PATH(X11_Xpm_INCLUDE_PATH X11/xpm.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xv_INCLUDE_PATH X11/extensions/Xvlib.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_Xss_LIB Xss ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) @@ -69,6 +70,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) + FIND_LIBRARY(X11_Xv_LIB Xv ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) if (X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -100,6 +102,12 @@ if (UNIX) 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) + + if(X11_Xv_LIB AND X11_Xv_INCLUDE_PATH) + set(X11_XV_FOUND TRUE) + set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xv_LIB}) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xv_INCLUDE_PATH}) + endif(X11_Xv_LIB AND X11_Xv_INCLUDE_PATH) if (X11_Xau_LIB) set(X11_Xau_FOUND TRUE) @@ -324,6 +332,8 @@ if (UNIX) X11_Xft_LIB X11_Xft_INCLUDE_PATH X11_Xshape_INCLUDE_PATH + X11_Xv_LIB + X11_Xv_INCLUDE_PATH ) endif (UNIX) -- cgit v1.2.1 From 72c8b2ee65d452ad54bae1864aff4fd18d399dfa Mon Sep 17 00:00:00 2001 From: Matthias Kretz Date: Tue, 12 Sep 2006 09:45:54 +0000 Subject: don't put the Xv lib into X11_LIBRARIES, use X11_Xv_LIB instead svn path=/trunk/KDE/kdelibs/; revision=583418 --- modules/FindX11.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 4c314ef8..516e3fe3 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -105,7 +105,6 @@ if (UNIX) if(X11_Xv_LIB AND X11_Xv_INCLUDE_PATH) set(X11_XV_FOUND TRUE) - set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xv_LIB}) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xv_INCLUDE_PATH}) endif(X11_Xv_LIB AND X11_Xv_INCLUDE_PATH) -- cgit v1.2.1 From 1ef11223baa52a42c70bd381940303b18cddd47e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 10 Oct 2006 17:28:48 +0000 Subject: Normalization. Move X11-detecting stuff into kdelibs out of kdegraphics, adjust for style of kdelibs. Put some order in the mess of header and libs checks for X11. svn path=/trunk/KDE/kdelibs/; revision=594266 --- modules/FindX11.cmake | 66 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 26 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 516e3fe3..dddf7859 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -29,48 +29,57 @@ if (UNIX) FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xlib_INCLUDE_PATH X11/Xlib.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xaccessstr_INCLUDE_PATH X11/extensions/XKBstr.h ${X11_INC_SEARCH_PATH}) -#Solaris lacks this file, so we should skip kxkbd here + + # Look for includes; keep the list sorted by name of the cmake *_INCLUDE_PATH + # variable (which doesn't need to match the include file name). + + # Solaris lacks XKBrules.h, so we should skip kxkbd there. 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_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.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}) - FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_dpms_INCLUDE_PATH X11/extensions/dpms.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xf86misc_INCLUDE_PATH X11/extensions/xf86misc.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h ${X11_INC_SEARCH_PATH}) - 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_Xinput_INCLUDE_PATH X11/extensions/XInput.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}) - FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h ${X11_INC_SEARCH_PATH}) + 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_Xv_INCLUDE_PATH X11/extensions/Xvlib.h ${X11_INC_SEARCH_PATH}) - FIND_LIBRARY(X11_Xss_LIB Xss ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + + FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + + # Find additional X libraries. Keep list sorted by library name. + FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + 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_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xss_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_Xau_LIB Xau ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - 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) + 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) + FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) if (X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -172,6 +181,11 @@ if (UNIX) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xxf86misc_INCLUDE_PATH}) endif (X11_Xxf86misc_INCLUDE_PATH) + if (X11_xf86vmode_INCLUDE_PATH) + set(X11_xf86vmode_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_xf86vmode_INCLUDE_PATH}) + endif (X11_xf86vmode_INCLUDE_PATH) + if (X11_Xcursor_INCLUDE_PATH AND X11_Xcursor_LIB) set(X11_Xcursor_FOUND TRUE) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcursor_INCLUDE_PATH}) -- cgit v1.2.1 From f56160b3608225df97b09a8742f3c11bc90a4371 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 16 Oct 2006 13:30:34 +0000 Subject: Fix tab svn path=/trunk/KDE/kdelibs/; revision=596008 --- modules/FindX11.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index dddf7859..1fd45e17 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -338,13 +338,13 @@ if (UNIX) X11_Xkb_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH X11_Xscreensaver_INCLUDE_PATH - X11_Xpm_INCLUDE_PATH - X11_Xpm_LIB + X11_Xpm_INCLUDE_PATH + X11_Xpm_LIB X11_Xinput_LIB X11_Xinput_INCLUDE_PATH - X11_Xft_LIB - X11_Xft_INCLUDE_PATH - X11_Xshape_INCLUDE_PATH + X11_Xft_LIB + X11_Xft_INCLUDE_PATH + X11_Xshape_INCLUDE_PATH X11_Xv_LIB X11_Xv_INCLUDE_PATH ) -- cgit v1.2.1 From 826fb3961a1b4a356a365af7167734d4bb346264 Mon Sep 17 00:00:00 2001 From: Philip Falkner Date: Tue, 13 Feb 2007 23:21:47 +0000 Subject: Find XShm svn path=/trunk/KDE/kdelibs/; revision=633385 --- modules/FindX11.cmake | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 1fd45e17..f171b1b0 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -57,6 +57,7 @@ if (UNIX) 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_Xv_INCLUDE_PATH X11/extensions/Xvlib.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) @@ -151,6 +152,11 @@ if (UNIX) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdamage_INCLUDE_PATH}) endif (X11_Xdamage_INCLUDE_PATH) + if (X11_XShm_INCLUDE_PATH) + set(X11_XShm_FOUND TRUE) + set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XShm_INCLUDE_PATH}) + endif (X11_XShm_INCLUDE_PATH) + if (X11_XTest_INCLUDE_PATH AND X11_XTest_LIB) set(X11_XTest_FOUND TRUE) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XTest_INCLUDE_PATH}) @@ -347,6 +353,7 @@ if (UNIX) X11_Xshape_INCLUDE_PATH X11_Xv_LIB X11_Xv_INCLUDE_PATH + X11_XShm_INCLUDE_PATH ) endif (UNIX) -- cgit v1.2.1 From 3bc95c642db6c2fdb50d3d10cc3252007409d7a6 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 28 Feb 2007 19:32:04 +0000 Subject: -some formatting in FindX11.cmake -only use check_library_exists() if libICE hasn_t been found -check that ICE has been found in FindQt4.cmake Alex This should help against the problem, right ? CCMAIL: winter@kde.org svn path=/trunk/KDE/kdelibs/; revision=638084 --- modules/FindX11.cmake | 196 ++++++++++++++++++++++++++++---------------------- 1 file changed, 111 insertions(+), 85 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index f171b1b0..4216031c 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -3,6 +3,19 @@ # X11_FOUND - True if X11 is available # X11_INCLUDE_DIR - include directories to use X11 # 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 # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -12,75 +25,78 @@ if (UNIX) set(X11_INC_SEARCH_PATH /usr/X11R6/include - /usr/local/include /usr/include/X11 /usr/openwin/include /usr/openwin/share/include /opt/graphics/OpenGL/include - /usr/include ) set(X11_LIB_SEARCH_PATH /usr/X11R6/lib - /usr/local/lib /usr/openwin/lib - /usr/lib ) - FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xlib_INCLUDE_PATH X11/Xlib.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xlib_INCLUDE_PATH X11/Xlib.h ${X11_INC_SEARCH_PATH}) # Look for includes; keep the list sorted by name of the cmake *_INCLUDE_PATH # variable (which doesn't need to match the include file name). # Solaris lacks XKBrules.h, so we should skip kxkbd there. - 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_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}) - FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_dpms_INCLUDE_PATH X11/extensions/dpms.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xf86misc_INCLUDE_PATH X11/extensions/xf86misc.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH}) - 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_Xpm_INCLUDE_PATH X11/xpm.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h ${X11_INC_SEARCH_PATH}) + 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_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}) + FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_dpms_INCLUDE_PATH X11/extensions/dpms.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xf86misc_INCLUDE_PATH X11/extensions/xf86misc.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH}) + 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_Xpm_INCLUDE_PATH X11/xpm.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h ${X11_INC_SEARCH_PATH}) 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_Xv_INCLUDE_PATH X11/extensions/Xvlib.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.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_Xv_INCLUDE_PATH X11/extensions/Xvlib.h ${X11_INC_SEARCH_PATH}) - FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) # Find additional X libraries. Keep list sorted by library name. - FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_ICE_LIB ICE ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - 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_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) - FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + 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_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) + FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + + set(X11_LIBRARY_DIR "") + if (X11_X11_LIB) + get_filename_component(X11_LIBRARY_DIR ${X11_X11_LIB} PATH) + endif (X11_X11_LIB) if (X11_X11_INCLUDE_PATH) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) @@ -95,8 +111,8 @@ if (UNIX) 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}) + 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) @@ -108,16 +124,16 @@ if (UNIX) endif (X11_Xext_LIB) if(X11_Xft_LIB AND X11_Xft_INCLUDE_PATH) - 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 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) if(X11_Xv_LIB AND X11_Xv_INCLUDE_PATH) 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) - + if (X11_Xau_LIB) set(X11_Xau_FOUND TRUE) set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) @@ -141,7 +157,6 @@ 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) set(X11_Xcomposite_FOUND TRUE) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcomposite_INCLUDE_PATH}) @@ -217,21 +232,18 @@ if (UNIX) set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput_INCLUDE_PATH}) endif (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) - # Deprecated variable for backwards compatibility with CMake 1.4 - if (X11_X11_INCLUDE_PATH) - if (X11_LIBRARIES) - set(X11_FOUND 1) - endif (X11_LIBRARIES) - endif (X11_X11_INCLUDE_PATH) + if(X11_ICE_LIB AND X11_ICE_INCLUDE_PATH) + set(X11_ICE_FOUND TRUE) + endif(X11_ICE_LIB AND X11_ICE_INCLUDE_PATH) - set(X11_LIBRARY_DIR "") - if (X11_X11_LIB) - GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH) - endif (X11_X11_LIB) + # Deprecated variable for backwards compatibility with CMake 1.4 + if (X11_X11_INCLUDE_PATH AND X11_LIBRARIES) + set(X11_FOUND 1) + endif (X11_X11_INCLUDE_PATH AND X11_LIBRARIES) if (X11_FOUND) - INCLUDE(CheckFunctionExists) - INCLUDE(CheckLibraryExists) + include(CheckFunctionExists) + include(CheckLibraryExists) # Translated from an autoconf-generated configure script. # See libs.m4 in autoconf's m4 directory. @@ -241,14 +253,14 @@ if (UNIX) set(X11_X_EXTRA_LIBS "") # See if XOpenDisplay in X11 works by itself. - CHECK_LIBRARY_EXISTS("${X11_LIBRARIES}" "XOpenDisplay" "${X11_LIBRARY_DIR}" X11_LIB_X11_SOLO) + check_library_exists("${X11_LIBRARIES}" "XOpenDisplay" "${X11_LIBRARY_DIR}" X11_LIB_X11_SOLO) if (NOT X11_LIB_X11_SOLO) # Find library needed for dnet_ntoa. - CHECK_LIBRARY_EXISTS("dnet" "dnet_ntoa" "" X11_LIB_DNET_HAS_DNET_NTOA) + check_library_exists("dnet" "dnet_ntoa" "" X11_LIB_DNET_HAS_DNET_NTOA) if (X11_LIB_DNET_HAS_DNET_NTOA) set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet) else (X11_LIB_DNET_HAS_DNET_NTOA) - CHECK_LIBRARY_EXISTS("dnet_stub" "dnet_ntoa" "" X11_LIB_DNET_STUB_HAS_DNET_NTOA) + check_library_exists("dnet_stub" "dnet_ntoa" "" X11_LIB_DNET_STUB_HAS_DNET_NTOA) if (X11_LIB_DNET_STUB_HAS_DNET_NTOA) set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub) endif (X11_LIB_DNET_STUB_HAS_DNET_NTOA) @@ -256,13 +268,13 @@ if (UNIX) endif (NOT X11_LIB_X11_SOLO) # Find library needed for gethostbyname. - CHECK_FUNCTION_EXISTS("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME) + check_function_exists("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME) if (NOT CMAKE_HAVE_GETHOSTBYNAME) - CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + check_library_exists("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) if (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl) else (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - CHECK_LIBRARY_EXISTS("bsd" "gethostbyname" "" CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) + check_library_exists("bsd" "gethostbyname" "" CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) if (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd) endif (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) @@ -270,43 +282,52 @@ if (UNIX) endif (NOT CMAKE_HAVE_GETHOSTBYNAME) # Find library needed for connect. - CHECK_FUNCTION_EXISTS("connect" CMAKE_HAVE_CONNECT) + check_function_exists("connect" CMAKE_HAVE_CONNECT) if (NOT CMAKE_HAVE_CONNECT) - CHECK_LIBRARY_EXISTS("socket" "connect" "" CMAKE_LIB_SOCKET_HAS_CONNECT) + check_library_exists("socket" "connect" "" CMAKE_LIB_SOCKET_HAS_CONNECT) if (CMAKE_LIB_SOCKET_HAS_CONNECT) set(X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS}) endif (CMAKE_LIB_SOCKET_HAS_CONNECT) endif (NOT CMAKE_HAVE_CONNECT) # Find library needed for remove. - CHECK_FUNCTION_EXISTS("remove" CMAKE_HAVE_REMOVE) + check_function_exists("remove" CMAKE_HAVE_REMOVE) if (NOT CMAKE_HAVE_REMOVE) - CHECK_LIBRARY_EXISTS("posix" "remove" "" CMAKE_LIB_POSIX_HAS_REMOVE) + check_library_exists("posix" "remove" "" CMAKE_LIB_POSIX_HAS_REMOVE) if (CMAKE_LIB_POSIX_HAS_REMOVE) set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix) endif (CMAKE_LIB_POSIX_HAS_REMOVE) endif (NOT CMAKE_HAVE_REMOVE) # Find library needed for shmat. - CHECK_FUNCTION_EXISTS("shmat" CMAKE_HAVE_SHMAT) + check_function_exists("shmat" CMAKE_HAVE_SHMAT) if (NOT CMAKE_HAVE_SHMAT) - CHECK_LIBRARY_EXISTS("ipc" "shmat" "" CMAKE_LIB_IPS_HAS_SHMAT) + check_library_exists("ipc" "shmat" "" CMAKE_LIB_IPS_HAS_SHMAT) 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$") - 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 -lICE) - endif (CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) + 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) + endif (X11_ICE_FOUND) + # Build the final list of libraries. set(X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS}) + + message(STATUS "Found X11: ${X11_X11_LIB}") + else (X11_FOUND) + if (X11_FIND_REQUIRED) + message(FATAL_ERROR "Could not find X11") + endif (X11_FIND_REQUIRED) endif (X11_FOUND) - MARK_AS_ADVANCED( + mark_as_advanced( X11_X11_INCLUDE_PATH X11_X11_LIB X11_Xext_LIB @@ -326,6 +347,7 @@ if (UNIX) X11_Xrender_INCLUDE_PATH X11_Xxf86misc_LIB X11_Xxf86misc_INCLUDE_PATH + X11_xf86vmode_INCLUDE_PATH X11_Xinerama_LIB X11_Xinerama_INCLUDE_PATH X11_XTest_LIB @@ -354,6 +376,10 @@ if (UNIX) X11_Xv_LIB X11_Xv_INCLUDE_PATH X11_XShm_INCLUDE_PATH + X11_ICE_LIB + X11_ICE_INCLUDE_PATH ) endif (UNIX) + +# X11_FIND_REQUIRED_ could be checked too, but they were introduced in cmake 2.4.4 -- cgit v1.2.1 From c1d5726abd8600b19e76537f9ee835840f44f319 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 28 Feb 2007 20:35:57 +0000 Subject: fix X11 detection again. Whats the point of not searching X11 in /usr/include, when it is actually installed there for almost all newer distros? svn path=/trunk/KDE/kdelibs/; revision=638102 --- modules/FindX11.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 4216031c..8eeabfe4 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -24,16 +24,20 @@ if (UNIX) set(X11_FOUND 0) set(X11_INC_SEARCH_PATH - /usr/X11R6/include + /usr/local/include + /usr/include + /usr/X11R6/include /usr/include/X11 - /usr/openwin/include - /usr/openwin/share/include + /usr/openwin/include + /usr/openwin/share/include /opt/graphics/OpenGL/include ) set(X11_LIB_SEARCH_PATH + /usr/local/lib + /usr/lib /usr/X11R6/lib - /usr/openwin/lib + /usr/openwin/lib ) FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) -- cgit v1.2.1 From f8b81f2d6d89d867ab0034e36e3891eb16ca3a8e Mon Sep 17 00:00:00 2001 From: Hasso Tepper Date: Wed, 11 Apr 2007 13:47:46 +0000 Subject: Add paths for systems using pkgsrc (NetBSD and DragonFlyBSD). Why KDE uses it's own FindX11 at all? svn path=/trunk/KDE/kdelibs/; revision=652564 --- modules/FindX11.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 8eeabfe4..9e4038c9 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -24,6 +24,7 @@ if (UNIX) set(X11_FOUND 0) set(X11_INC_SEARCH_PATH + /usr/pkg/xorg/include /usr/local/include /usr/include /usr/X11R6/include @@ -34,6 +35,7 @@ if (UNIX) ) set(X11_LIB_SEARCH_PATH + /usr/pkg/xorg/lib /usr/local/lib /usr/lib /usr/X11R6/lib -- cgit v1.2.1 From 9f381b0433fd1301bc85c2be764d32772568d857 Mon Sep 17 00:00:00 2001 From: Hasso Tepper Date: Fri, 13 Apr 2007 11:16:12 +0000 Subject: The modular X.org from pkgsrc isn't installed into it's own directory any more. svn path=/trunk/KDE/kdelibs/; revision=653455 --- modules/FindX11.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 9e4038c9..18671bb3 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -25,6 +25,7 @@ if (UNIX) set(X11_INC_SEARCH_PATH /usr/pkg/xorg/include + /usr/pkg/include /usr/local/include /usr/include /usr/X11R6/include @@ -36,6 +37,7 @@ if (UNIX) set(X11_LIB_SEARCH_PATH /usr/pkg/xorg/lib + /usr/pkg/lib /usr/local/lib /usr/lib /usr/X11R6/lib -- cgit v1.2.1 From 4c439a743b34806807791aa95bf4e336e09d7ce8 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 30 May 2007 15:48:30 +0000 Subject: partly sync with FindX11.cmake from cmake cvs, mainly upper/lower case Alex svn path=/trunk/KDE/kdelibs/; revision=669849 --- modules/FindX11.cmake | 463 +++++++++++++++++++++++++------------------------- 1 file changed, 233 insertions(+), 230 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 18671bb3..5126582d 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -20,28 +20,31 @@ # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. -if (UNIX) - set(X11_FOUND 0) - - set(X11_INC_SEARCH_PATH +IF (UNIX) + SET(X11_FOUND 0) + # X11 is never a framework and some header files may be + # found in tcl on the mac + SET(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK}) + SET(CMAKE_FIND_FRAMEWORK NEVER) + SET(X11_INC_SEARCH_PATH /usr/pkg/xorg/include /usr/pkg/include - /usr/local/include - /usr/include - /usr/X11R6/include + /usr/X11R6/include + /usr/local/include /usr/include/X11 - /usr/openwin/include - /usr/openwin/share/include + /usr/openwin/include + /usr/openwin/share/include /opt/graphics/OpenGL/include + /usr/include ) - set(X11_LIB_SEARCH_PATH + SET(X11_LIB_SEARCH_PATH /usr/pkg/xorg/lib /usr/pkg/lib - /usr/local/lib - /usr/lib /usr/X11R6/lib - /usr/openwin/lib + /usr/local/lib + /usr/openwin/lib + /usr/lib ) FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) @@ -49,7 +52,7 @@ if (UNIX) # Look for includes; keep the list sorted by name of the cmake *_INCLUDE_PATH # variable (which doesn't need to match the include file name). - + # Solaris lacks XKBrules.h, so we should skip kxkbd there. 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}) @@ -101,241 +104,241 @@ if (UNIX) FIND_LIBRARY(X11_Xv_LIB Xv ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - set(X11_LIBRARY_DIR "") - if (X11_X11_LIB) - get_filename_component(X11_LIBRARY_DIR ${X11_X11_LIB} PATH) - endif (X11_X11_LIB) - - if (X11_X11_INCLUDE_PATH) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) - endif (X11_X11_INCLUDE_PATH) - - if (X11_Xlib_INCLUDE_PATH) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xlib_INCLUDE_PATH}) - endif (X11_Xlib_INCLUDE_PATH) - - if (X11_Xutil_INCLUDE_PATH) - 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) - - if (X11_Xext_LIB) - set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) - endif (X11_Xext_LIB) - - if(X11_Xft_LIB AND X11_Xft_INCLUDE_PATH) - 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) - - if(X11_Xv_LIB AND X11_Xv_INCLUDE_PATH) - 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) - - if (X11_Xau_LIB) - set(X11_Xau_FOUND TRUE) - set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) - endif (X11_Xau_LIB) - - if (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) - set(X11_Xdmcp_FOUND TRUE) - set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xdmcp_LIB}) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdmcp_INCLUDE_PATH}) - endif (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) - - if (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) - set(X11_Xaccess_FOUND TRUE) - set(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH}) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xaccess_INCLUDE_PATH}) - endif (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) - - if (X11_Xpm_INCLUDE_PATH AND X11_Xpm_LIB) - set(X11_Xpm_FOUND TRUE) - set(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xpm_LIB}) - 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) - set(X11_Xcomposite_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcomposite_INCLUDE_PATH}) - endif (X11_Xcomposite_INCLUDE_PATH) - - if (X11_Xdamage_INCLUDE_PATH) - set(X11_Xdamage_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdamage_INCLUDE_PATH}) - endif (X11_Xdamage_INCLUDE_PATH) - - if (X11_XShm_INCLUDE_PATH) - set(X11_XShm_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XShm_INCLUDE_PATH}) - endif (X11_XShm_INCLUDE_PATH) - - if (X11_XTest_INCLUDE_PATH AND X11_XTest_LIB) - set(X11_XTest_FOUND TRUE) - 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) - set(X11_Xinerama_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinerama_INCLUDE_PATH}) - endif (X11_Xinerama_INCLUDE_PATH) - - if (X11_Xfixes_INCLUDE_PATH) - set(X11_Xfixes_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xfixes_INCLUDE_PATH}) - endif (X11_Xfixes_INCLUDE_PATH) - - 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) - set(X11_Xrandr_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xrandr_INCLUDE_PATH}) - endif (X11_Xrandr_INCLUDE_PATH) - - if (X11_Xxf86misc_INCLUDE_PATH) - set(X11_Xxf86misc_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xxf86misc_INCLUDE_PATH}) - endif (X11_Xxf86misc_INCLUDE_PATH) - - if (X11_xf86vmode_INCLUDE_PATH) - set(X11_xf86vmode_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_xf86vmode_INCLUDE_PATH}) - endif (X11_xf86vmode_INCLUDE_PATH) - - if (X11_Xcursor_INCLUDE_PATH AND X11_Xcursor_LIB) - set(X11_Xcursor_FOUND TRUE) - 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) - set(X11_Xscreensaver_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xscreensaver_INCLUDE_PATH}) - endif (X11_Xscreensaver_INCLUDE_PATH) - - if (X11_dpms_INCLUDE_PATH) - set(X11_dpms_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_dpms_INCLUDE_PATH}) - endif (X11_dpms_INCLUDE_PATH) - - if (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) - set(X11_Xkb_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xkb_INCLUDE_PATH} ) - endif (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) - - if (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) - set(X11_Xinput_FOUND TRUE) - set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput_INCLUDE_PATH}) - endif (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) - - if(X11_ICE_LIB AND X11_ICE_INCLUDE_PATH) - set(X11_ICE_FOUND TRUE) - endif(X11_ICE_LIB AND X11_ICE_INCLUDE_PATH) + SET(X11_LIBRARY_DIR "") + IF(X11_X11_LIB) + GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH) + ENDIF(X11_X11_LIB) + + IF(X11_X11_INCLUDE_PATH) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) + ENDIF(X11_X11_INCLUDE_PATH) + + IF(X11_Xlib_INCLUDE_PATH) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xlib_INCLUDE_PATH}) + ENDIF(X11_Xlib_INCLUDE_PATH) + + IF(X11_Xutil_INCLUDE_PATH) + 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) + + IF(X11_Xext_LIB) + SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xext_LIB}) + ENDIF(X11_Xext_LIB) + + IF(X11_Xft_LIB AND X11_Xft_INCLUDE_PATH) + 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) + + IF(X11_Xv_LIB AND X11_Xv_INCLUDE_PATH) + 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) + + IF (X11_Xau_LIB) + SET(X11_Xau_FOUND TRUE) + SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xau_LIB}) + ENDIF (X11_Xau_LIB) + + IF (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) + SET(X11_Xdmcp_FOUND TRUE) + SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xdmcp_LIB}) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdmcp_INCLUDE_PATH}) + ENDIF (X11_Xdmcp_INCLUDE_PATH AND X11_Xdmcp_LIB) + + IF (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) + SET(X11_Xaccess_FOUND TRUE) + SET(X11_Xaccess_INCLUDE_PATH ${X11_Xaccessstr_INCLUDE_PATH}) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xaccess_INCLUDE_PATH}) + ENDIF (X11_Xaccessrules_INCLUDE_PATH AND X11_Xaccessstr_INCLUDE_PATH) + + IF (X11_Xpm_INCLUDE_PATH AND X11_Xpm_LIB) + SET(X11_Xpm_FOUND TRUE) + SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_Xpm_LIB}) + 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) + SET(X11_Xcomposite_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xcomposite_INCLUDE_PATH}) + ENDIF (X11_Xcomposite_INCLUDE_PATH) + + IF (X11_Xdamage_INCLUDE_PATH) + SET(X11_Xdamage_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xdamage_INCLUDE_PATH}) + ENDIF (X11_Xdamage_INCLUDE_PATH) + + IF (X11_XShm_INCLUDE_PATH) + SET(X11_XShm_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XShm_INCLUDE_PATH}) + ENDIF (X11_XShm_INCLUDE_PATH) + + IF (X11_XTest_INCLUDE_PATH AND X11_XTest_LIB) + SET(X11_XTest_FOUND TRUE) + 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) + SET(X11_Xinerama_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinerama_INCLUDE_PATH}) + ENDIF (X11_Xinerama_INCLUDE_PATH) + + IF (X11_Xfixes_INCLUDE_PATH) + SET(X11_Xfixes_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xfixes_INCLUDE_PATH}) + ENDIF (X11_Xfixes_INCLUDE_PATH) + + 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) + SET(X11_Xrandr_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xrandr_INCLUDE_PATH}) + ENDIF (X11_Xrandr_INCLUDE_PATH) + + IF (X11_Xxf86misc_INCLUDE_PATH) + SET(X11_Xxf86misc_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xxf86misc_INCLUDE_PATH}) + ENDIF (X11_Xxf86misc_INCLUDE_PATH) + + IF (X11_xf86vmode_INCLUDE_PATH) + SET(X11_xf86vmode_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_xf86vmode_INCLUDE_PATH}) + ENDIF (X11_xf86vmode_INCLUDE_PATH) + + IF (X11_Xcursor_INCLUDE_PATH AND X11_Xcursor_LIB) + SET(X11_Xcursor_FOUND TRUE) + 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) + SET(X11_Xscreensaver_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xscreensaver_INCLUDE_PATH}) + ENDIF (X11_Xscreensaver_INCLUDE_PATH) + + IF (X11_dpms_INCLUDE_PATH) + SET(X11_dpms_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_dpms_INCLUDE_PATH}) + ENDIF (X11_dpms_INCLUDE_PATH) + + IF (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) + SET(X11_Xkb_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xkb_INCLUDE_PATH} ) + ENDIF (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) + + IF (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) + SET(X11_Xinput_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput_INCLUDE_PATH}) + ENDIF (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) + + IF(X11_ICE_LIB AND X11_ICE_INCLUDE_PATH) + SET(X11_ICE_FOUND TRUE) + ENDIF(X11_ICE_LIB AND X11_ICE_INCLUDE_PATH) # Deprecated variable for backwards compatibility with CMake 1.4 - if (X11_X11_INCLUDE_PATH AND X11_LIBRARIES) - set(X11_FOUND 1) - endif (X11_X11_INCLUDE_PATH AND X11_LIBRARIES) + IF (X11_X11_INCLUDE_PATH AND X11_LIBRARIES) + SET(X11_FOUND 1) + ENDIF (X11_X11_INCLUDE_PATH AND X11_LIBRARIES) - if (X11_FOUND) - include(CheckFunctionExists) - include(CheckLibraryExists) + IF(X11_FOUND) + INCLUDE(CheckFunctionExists) + INCLUDE(CheckLibraryExists) # Translated from an autoconf-generated configure script. # See libs.m4 in autoconf's m4 directory. - if ($ENV{ISC} MATCHES "^yes$") - set(X11_X_EXTRA_LIBS -lnsl_s -linet) - else ($ENV{ISC} MATCHES "^yes$") - set(X11_X_EXTRA_LIBS "") + IF($ENV{ISC} MATCHES "^yes$") + SET(X11_X_EXTRA_LIBS -lnsl_s -linet) + ELSE($ENV{ISC} MATCHES "^yes$") + SET(X11_X_EXTRA_LIBS "") # See if XOpenDisplay in X11 works by itself. - check_library_exists("${X11_LIBRARIES}" "XOpenDisplay" "${X11_LIBRARY_DIR}" X11_LIB_X11_SOLO) - if (NOT X11_LIB_X11_SOLO) + CHECK_LIBRARY_EXISTS("${X11_LIBRARIES}" "XOpenDisplay" "${X11_LIBRARY_DIR}" X11_LIB_X11_SOLO) + IF(NOT X11_LIB_X11_SOLO) # Find library needed for dnet_ntoa. - check_library_exists("dnet" "dnet_ntoa" "" X11_LIB_DNET_HAS_DNET_NTOA) - if (X11_LIB_DNET_HAS_DNET_NTOA) - set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet) - else (X11_LIB_DNET_HAS_DNET_NTOA) - check_library_exists("dnet_stub" "dnet_ntoa" "" X11_LIB_DNET_STUB_HAS_DNET_NTOA) - if (X11_LIB_DNET_STUB_HAS_DNET_NTOA) - set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub) - endif (X11_LIB_DNET_STUB_HAS_DNET_NTOA) - endif (X11_LIB_DNET_HAS_DNET_NTOA) - endif (NOT X11_LIB_X11_SOLO) + CHECK_LIBRARY_EXISTS("dnet" "dnet_ntoa" "" X11_LIB_DNET_HAS_DNET_NTOA) + IF (X11_LIB_DNET_HAS_DNET_NTOA) + SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet) + ELSE (X11_LIB_DNET_HAS_DNET_NTOA) + CHECK_LIBRARY_EXISTS("dnet_stub" "dnet_ntoa" "" X11_LIB_DNET_STUB_HAS_DNET_NTOA) + IF (X11_LIB_DNET_STUB_HAS_DNET_NTOA) + SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -ldnet_stub) + ENDIF (X11_LIB_DNET_STUB_HAS_DNET_NTOA) + ENDIF (X11_LIB_DNET_HAS_DNET_NTOA) + ENDIF(NOT X11_LIB_X11_SOLO) # Find library needed for gethostbyname. - check_function_exists("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME) - if (NOT CMAKE_HAVE_GETHOSTBYNAME) - check_library_exists("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - if (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl) - else (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - check_library_exists("bsd" "gethostbyname" "" CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) - if (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) - set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd) - endif (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) - endif (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) - endif (NOT CMAKE_HAVE_GETHOSTBYNAME) + CHECK_FUNCTION_EXISTS("gethostbyname" CMAKE_HAVE_GETHOSTBYNAME) + IF(NOT CMAKE_HAVE_GETHOSTBYNAME) + CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + IF (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lnsl) + ELSE (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + CHECK_LIBRARY_EXISTS("bsd" "gethostbyname" "" CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) + IF (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) + SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lbsd) + ENDIF (CMAKE_LIB_BSD_HAS_GETHOSTBYNAME) + ENDIF (CMAKE_LIB_NSL_HAS_GETHOSTBYNAME) + ENDIF(NOT CMAKE_HAVE_GETHOSTBYNAME) # Find library needed for connect. - check_function_exists("connect" CMAKE_HAVE_CONNECT) - if (NOT CMAKE_HAVE_CONNECT) - check_library_exists("socket" "connect" "" CMAKE_LIB_SOCKET_HAS_CONNECT) - if (CMAKE_LIB_SOCKET_HAS_CONNECT) - set(X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS}) - endif (CMAKE_LIB_SOCKET_HAS_CONNECT) - endif (NOT CMAKE_HAVE_CONNECT) + CHECK_FUNCTION_EXISTS("connect" CMAKE_HAVE_CONNECT) + IF(NOT CMAKE_HAVE_CONNECT) + CHECK_LIBRARY_EXISTS("socket" "connect" "" CMAKE_LIB_SOCKET_HAS_CONNECT) + IF (CMAKE_LIB_SOCKET_HAS_CONNECT) + SET (X11_X_EXTRA_LIBS -lsocket ${X11_X_EXTRA_LIBS}) + ENDIF (CMAKE_LIB_SOCKET_HAS_CONNECT) + ENDIF(NOT CMAKE_HAVE_CONNECT) # Find library needed for remove. - check_function_exists("remove" CMAKE_HAVE_REMOVE) - if (NOT CMAKE_HAVE_REMOVE) - check_library_exists("posix" "remove" "" CMAKE_LIB_POSIX_HAS_REMOVE) - if (CMAKE_LIB_POSIX_HAS_REMOVE) - set(X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix) - endif (CMAKE_LIB_POSIX_HAS_REMOVE) - endif (NOT CMAKE_HAVE_REMOVE) + CHECK_FUNCTION_EXISTS("remove" CMAKE_HAVE_REMOVE) + IF(NOT CMAKE_HAVE_REMOVE) + CHECK_LIBRARY_EXISTS("posix" "remove" "" CMAKE_LIB_POSIX_HAS_REMOVE) + IF (CMAKE_LIB_POSIX_HAS_REMOVE) + SET (X11_X_EXTRA_LIBS ${X11_X_EXTRA_LIBS} -lposix) + ENDIF (CMAKE_LIB_POSIX_HAS_REMOVE) + ENDIF(NOT CMAKE_HAVE_REMOVE) # Find library needed for shmat. - check_function_exists("shmat" CMAKE_HAVE_SHMAT) - if (NOT CMAKE_HAVE_SHMAT) - check_library_exists("ipc" "shmat" "" CMAKE_LIB_IPS_HAS_SHMAT) - 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$") - - if (X11_ICE_FOUND) - check_library_exists("ICE" "IceConnectionNumber" "${X11_LIBRARY_DIR}" + CHECK_FUNCTION_EXISTS("shmat" CMAKE_HAVE_SHMAT) + IF(NOT CMAKE_HAVE_SHMAT) + CHECK_LIBRARY_EXISTS("ipc" "shmat" "" CMAKE_LIB_IPS_HAS_SHMAT) + 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$") + + 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) - endif (X11_ICE_FOUND) + 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. - set(X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS}) + SET(X11_LIBRARIES ${X11_X_PRE_LIBS} ${X11_LIBRARIES} ${X11_X_EXTRA_LIBS}) - message(STATUS "Found X11: ${X11_X11_LIB}") - else (X11_FOUND) - if (X11_FIND_REQUIRED) - message(FATAL_ERROR "Could not find X11") - endif (X11_FIND_REQUIRED) - endif (X11_FOUND) + MESSAGE(STATUS "Found X11: ${X11_X11_LIB}") + ELSE (X11_FOUND) + IF (X11_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find X11") + ENDIF (X11_FIND_REQUIRED) + ENDIF (X11_FOUND) - mark_as_advanced( + MARK_AS_ADVANCED( X11_X11_INCLUDE_PATH X11_X11_LIB X11_Xext_LIB @@ -387,7 +390,7 @@ if (UNIX) X11_ICE_LIB X11_ICE_INCLUDE_PATH ) + SET(CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_SAVE}) +ENDIF (UNIX) -endif (UNIX) - -# X11_FIND_REQUIRED_ could be checked too, but they were introduced in cmake 2.4.4 +# X11_FIND_REQUIRED_ could be checked too -- cgit v1.2.1 From 56745a13db976fccfda8dac5328008892f8886e5 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 1 Jun 2007 17:26:46 +0000 Subject: -add some more X11_xxx_FOUND variables -if there is a X11_Foo_LIB and a X11_Foo_INCLUDE_PATH variables for a component, set X11_Foo_FOUND only to true if both are found -added X11_Xv_FOUND and X11_Xft_FOUND, X11_XV_FOUND and X11_XFT_FOUND will be removed soon Alex p.s. if this breaks something please CC me, both to neundorf@kde.org and alex.neundorf@kitware.com svn path=/trunk/KDE/kdelibs/; revision=670488 --- modules/FindX11.cmake | 97 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 33 deletions(-) (limited to 'modules/FindX11.cmake') 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. -- cgit v1.2.1 From 2ef97b0cb1836b6c2d26f8c4612f7c6f1dc18e57 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 4 Jun 2007 23:55:48 +0000 Subject: remove obsolete X11_XV_FOUND and X11_XFT_FOUND (use X11_Xv_FOUND and X11_Xft_FOUND instead) Alex svn path=/trunk/KDE/kdelibs/; revision=671547 --- modules/FindX11.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index fe1de788..37b0c7b3 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -168,13 +168,11 @@ IF (UNIX) 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_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 AND X11_Xau_INCLUDE_PATH) SET(X11_Xau_FOUND TRUE) -- cgit v1.2.1 From 00db3e5a85410ec7cfba9b08c3976b5a217d5797 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 5 Jun 2007 01:41:47 +0000 Subject: -/usr/lib, /usr/local/lib, /usr/include, /usr/local/include don't have to be listed explicitely, they are searched automatically -some more consisten lower casing and indentation Alex svn path=/trunk/KDE/kdelibs/; revision=671570 --- modules/FindX11.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 37b0c7b3..6b29dc51 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -6,8 +6,8 @@ # # and also the following more fine grained variables: # 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_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 @@ -16,23 +16,23 @@ # 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_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_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_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_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_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. -- cgit v1.2.1 From 7d5a849c70533c9f67024f818c0f240dd39ece12 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 6 Jun 2007 03:06:23 +0000 Subject: -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 --- modules/FindX11.cmake | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'modules/FindX11.cmake') 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 -- cgit v1.2.1 From 7a881261831736b6702cf5b9e636060da0ac58d1 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 8 Jun 2007 14:27:44 +0000 Subject: mark Xau_INCLUDE_PATH advanced Alex svn path=/trunk/KDE/kdelibs/; revision=672948 --- modules/FindX11.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 11b2ca9f..b3c0a4b7 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -371,6 +371,7 @@ IF (UNIX) X11_X11_LIB X11_Xext_LIB X11_Xau_LIB + X11_Xau_INCLUDE_PATH X11_Xlib_INCLUDE_PATH X11_Xutil_INCLUDE_PATH X11_Xcomposite_INCLUDE_PATH -- cgit v1.2.1 From a6b2d40be6e4cb4984a0a23ab8543f88b4570cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Sun, 24 Jun 2007 22:06:49 +0000 Subject: XSync extension. svn path=/trunk/KDE/kdelibs/; revision=679787 --- modules/FindX11.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index b3c0a4b7..79fc2a61 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -33,6 +33,7 @@ # 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 +# X11_XSync_INCLUDE_PATH, (in X11_Xext_LIB), X11_XSync_FOUND # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -98,6 +99,7 @@ IF (UNIX) 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}) + FIND_PATH(X11_XSync_INCLUDE_PATH X11/extensions/sync.h ${X11_INC_SEARCH_PATH}) FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) @@ -271,6 +273,11 @@ IF (UNIX) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput_INCLUDE_PATH}) ENDIF (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) + IF (X11_XSync_INCLUDE_PATH) + SET(X11_XSync_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_XSync_INCLUDE_PATH}) + ENDIF (X11_XSync_INCLUDE_PATH) + IF(X11_ICE_LIB AND X11_ICE_INCLUDE_PATH) SET(X11_ICE_FOUND TRUE) ENDIF(X11_ICE_LIB AND X11_ICE_INCLUDE_PATH) @@ -419,6 +426,7 @@ IF (UNIX) X11_XShm_INCLUDE_PATH X11_ICE_LIB X11_ICE_INCLUDE_PATH + X11_XSync_INCLUDE_PATH ) SET(CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_SAVE}) ENDIF (UNIX) -- cgit v1.2.1 From 90ff64277a72c3be7b1dd93827d2ab7f13e5c4f2 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 14 Aug 2007 07:07:01 +0000 Subject: Use find_package_handle_standard_args Remove not necessary path svn path=/trunk/KDE/kdelibs/; revision=699875 --- modules/FindX11.cmake | 4 ---- 1 file changed, 4 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 79fc2a61..e641e04f 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -48,21 +48,17 @@ IF (UNIX) /usr/pkg/xorg/include /usr/pkg/include /usr/X11R6/include - /usr/local/include /usr/include/X11 /usr/openwin/include /usr/openwin/share/include /opt/graphics/OpenGL/include - /usr/include ) SET(X11_LIB_SEARCH_PATH /usr/pkg/xorg/lib /usr/pkg/lib /usr/X11R6/lib - /usr/local/lib /usr/openwin/lib - /usr/lib ) FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) -- cgit v1.2.1 From d1058df393549b8c388f3960b8253b56bcc05f1e Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 14 Aug 2007 08:34:09 +0000 Subject: As the system paths were removed, tell cmake to look for the X libraries in those paths as well. Laurent, could you also please actually test the changes you do? Thanks. svn path=/trunk/KDE/kdelibs/; revision=699907 --- modules/FindX11.cmake | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index e641e04f..7a456016 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -98,28 +98,28 @@ IF (UNIX) FIND_PATH(X11_XSync_INCLUDE_PATH X11/extensions/sync.h ${X11_INC_SEARCH_PATH}) - FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_X11_LIB X11 ${X11_LIB_SEARCH_PATH}) # Find additional X libraries. Keep list sorted by library name. - FIND_LIBRARY(X11_ICE_LIB ICE ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) - 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_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) - FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH} NO_SYSTEM_PATH) + FIND_LIBRARY(X11_ICE_LIB ICE ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xdamage_LIB Xdamage ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xext_LIB Xext ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xfixes_LIB Xfixes ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xscreensaver_LIB Xss ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xt_LIB Xt ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_XTest_LIB Xtst ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xv_LIB Xv ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc ${X11_LIB_SEARCH_PATH}) SET(X11_LIBRARY_DIR "") IF(X11_X11_LIB) -- cgit v1.2.1 From e705d741fe590a1889019d2cd7721fffe8c9bcea Mon Sep 17 00:00:00 2001 From: Andriy Rysin Date: Tue, 23 Oct 2007 02:21:45 +0000 Subject: - include xkbfile into FindX11 svn path=/trunk/KDE/kdelibs/; revision=728345 --- modules/FindX11.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 7a456016..bf23d44d 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -25,6 +25,7 @@ # 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_Xkbfile_INCLUDE_PATH, X11_Xkbfile_LIB, X11_Xkbfile_FOUND # X11_Xpm_INCLUDE_PATH, X11_Xpm_LIB, X11_Xpm_FOUND # X11_XTest_INCLUDE_PATH, X11_XTest_LIB, X11_XTest_FOUND # X11_Xrandr_INCLUDE_PATH, X11_Xrandr_LIB, X11_Xrandr_FOUND @@ -85,6 +86,7 @@ IF (UNIX) FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h ${X11_INC_SEARCH_PATH}) 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_Xkbfile_INCLUDE_PATH X11/extensions/XKBfile.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xpm_INCLUDE_PATH X11/xpm.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_XTest_INCLUDE_PATH X11/extensions/XTest.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h ${X11_INC_SEARCH_PATH}) @@ -112,6 +114,7 @@ IF (UNIX) FIND_LIBRARY(X11_Xft_LIB Xft ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xinerama_LIB Xinerama ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xinput_LIB Xi ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_Xkbfile_LIB xkbfile ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xpm_LIB Xpm ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xrandr_LIB Xrandr ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xrender_LIB Xrender ${X11_LIB_SEARCH_PATH}) @@ -264,6 +267,11 @@ IF (UNIX) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xkb_INCLUDE_PATH} ) ENDIF (X11_Xkb_INCLUDE_PATH AND X11_Xkblib_INCLUDE_PATH AND X11_Xlib_INCLUDE_PATH) + IF (X11_Xkbfile_INCLUDE_PATH AND X11_Xkbfile_LIB AND X11_Xlib_INCLUDE_PATH) + SET(X11_Xkbfile_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xkbfile_INCLUDE_PATH} ) + ENDIF (X11_Xkbfile_INCLUDE_PATH AND X11_Xkbfile_LIB AND X11_Xlib_INCLUDE_PATH) + IF (X11_Xinput_INCLUDE_PATH AND X11_Xinput_LIB) SET(X11_Xinput_FOUND TRUE) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput_INCLUDE_PATH}) @@ -408,6 +416,8 @@ IF (UNIX) X11_Xf86misc_INCLUDE_PATH X11_Xkb_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH + X11_Xkbfile_INCLUDE_PATH + X11_Xkbfile_LIB X11_Xscreensaver_INCLUDE_PATH X11_Xscreensaver_LIB X11_Xpm_INCLUDE_PATH -- cgit v1.2.1 From 9c6403afc3f28c99e8ef186e3103b00f200c59ee Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Wed, 26 Dec 2007 21:30:52 +0000 Subject: also search for X11R7 svn path=/trunk/KDE/kdelibs/; revision=753207 --- modules/FindX11.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index bf23d44d..94cf9d38 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -49,6 +49,7 @@ IF (UNIX) /usr/pkg/xorg/include /usr/pkg/include /usr/X11R6/include + /usr/X11R7/include /usr/include/X11 /usr/openwin/include /usr/openwin/share/include @@ -59,6 +60,7 @@ IF (UNIX) /usr/pkg/xorg/lib /usr/pkg/lib /usr/X11R6/lib + /usr/X11R7/lib /usr/openwin/lib ) -- cgit v1.2.1 From 709e7c0b54eaeec5a26c20f31787b9bfa26925e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Thu, 3 Jan 2008 15:53:29 +0000 Subject: Consistent naming for xf86misc - include and flag are xf86misc, lib is Xxf86misc. svn path=/trunk/KDE/kdelibs/; revision=756696 --- modules/FindX11.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 94cf9d38..5fdbe82f 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -17,8 +17,8 @@ # 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_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 @@ -80,7 +80,7 @@ IF (UNIX) FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_dpms_INCLUDE_PATH X11/extensions/dpms.h ${X11_INC_SEARCH_PATH}) - FIND_PATH(X11_Xf86misc_INCLUDE_PATH X11/extensions/xf86misc.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_xf86misc_INCLUDE_PATH X11/extensions/xf86misc.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h ${X11_INC_SEARCH_PATH}) FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h ${X11_INC_SEARCH_PATH}) @@ -236,10 +236,10 @@ IF (UNIX) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xrandr_INCLUDE_PATH}) ENDIF (X11_Xrandr_INCLUDE_PATH AND X11_Xrandr_LIB) - 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 AND X11_Xxf86misc_LIB) + IF (X11_xf86misc_INCLUDE_PATH AND X11_Xxf86misc_LIB) + SET(X11_xf86misc_FOUND TRUE) + SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_xf86misc_INCLUDE_PATH}) + ENDIF (X11_xf86misc_INCLUDE_PATH AND X11_Xxf86misc_LIB) IF (X11_xf86vmode_INCLUDE_PATH) SET(X11_xf86vmode_FOUND TRUE) @@ -399,7 +399,7 @@ IF (UNIX) X11_Xrender_LIB X11_Xrender_INCLUDE_PATH X11_Xxf86misc_LIB - X11_Xxf86misc_INCLUDE_PATH + X11_xf86misc_INCLUDE_PATH X11_xf86vmode_INCLUDE_PATH X11_Xinerama_LIB X11_Xinerama_INCLUDE_PATH @@ -415,7 +415,7 @@ IF (UNIX) X11_Xaccessrules_INCLUDE_PATH X11_Xaccessstr_INCLUDE_PATH X11_Xdmcp_INCLUDE_PATH - X11_Xf86misc_INCLUDE_PATH + X11_xf86misc_INCLUDE_PATH X11_Xkb_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH X11_Xkbfile_INCLUDE_PATH -- cgit v1.2.1 From 643c9bd104e8630b75352293c482c68803700ae7 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Fri, 4 Jan 2008 16:54:52 +0000 Subject: this one is already marked as ADVANCED above Alex svn path=/trunk/KDE/kdelibs/; revision=757290 --- modules/FindX11.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 5fdbe82f..193723bc 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -415,7 +415,6 @@ IF (UNIX) X11_Xaccessrules_INCLUDE_PATH X11_Xaccessstr_INCLUDE_PATH X11_Xdmcp_INCLUDE_PATH - X11_xf86misc_INCLUDE_PATH X11_Xkb_INCLUDE_PATH X11_Xkblib_INCLUDE_PATH X11_Xkbfile_INCLUDE_PATH -- cgit v1.2.1 From 24e484499eef4c7c3339ae084ab13bf1bc42cc71 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Tue, 20 May 2008 14:35:32 +0000 Subject: perform discovery on X11/SM. svn path=/trunk/KDE/kdelibs/; revision=810354 --- modules/FindX11.cmake | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 193723bc..27702886 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -5,7 +5,8 @@ # X11_LIBRARIES - link against these to use X11 # # and also the following more fine grained variables: -# Include paths: X11_ICE_INCLUDE_PATH, X11_ICE_LIB, X11_ICE_FOUND +# X11_ICE_INCLUDE_PATH, X11_ICE_LIB, X11_ICE_FOUND +# X11_SM_INCLUDE_PATH, X11_SM_LIB, X11_SM_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 @@ -72,6 +73,7 @@ IF (UNIX) # Solaris lacks XKBrules.h, so we should skip kxkbd there. FIND_PATH(X11_ICE_INCLUDE_PATH X11/ICE/ICE.h ${X11_INC_SEARCH_PATH}) + FIND_PATH(X11_SM_INCLUDE_PATH X11/SM/SM.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}) @@ -106,6 +108,7 @@ IF (UNIX) # Find additional X libraries. Keep list sorted by library name. FIND_LIBRARY(X11_ICE_LIB ICE ${X11_LIB_SEARCH_PATH}) + FIND_LIBRARY(X11_SM_LIB SM ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xau_LIB Xau ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH}) FIND_LIBRARY(X11_Xcursor_LIB Xcursor ${X11_LIB_SEARCH_PATH}) @@ -288,6 +291,10 @@ IF (UNIX) SET(X11_ICE_FOUND TRUE) ENDIF(X11_ICE_LIB AND X11_ICE_INCLUDE_PATH) + IF(X11_SM_LIB AND X11_SM_INCLUDE_PATH) + SET(X11_SM_FOUND TRUE) + ENDIF(X11_SM_LIB AND X11_SM_INCLUDE_PATH) + # Deprecated variable for backwards compatibility with CMake 1.4 IF (X11_X11_INCLUDE_PATH AND X11_LIBRARIES) SET(X11_FOUND 1) @@ -361,11 +368,15 @@ IF (UNIX) ENDIF(NOT CMAKE_HAVE_SHMAT) ENDIF($ENV{ISC} MATCHES "^yes$") + IF (X11_SM_FOUND) + SET (X11_X_PRE_LIBS ${X11_X_PRE_LIBS} ${X11_SM_LIB}) + ENDIF (X11_SM_FOUND) + 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}) + SET (X11_X_PRE_LIBS ${X11_X_PRE_LIBS} ${X11_ICE_LIB}) ENDIF(CMAKE_LIB_ICE_HAS_ICECONNECTIONNUMBER) ENDIF (X11_ICE_FOUND) @@ -433,6 +444,8 @@ IF (UNIX) X11_XShm_INCLUDE_PATH X11_ICE_LIB X11_ICE_INCLUDE_PATH + X11_SM_LIB + X11_SM_INCLUDE_PATH X11_XSync_INCLUDE_PATH ) SET(CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_SAVE}) -- cgit v1.2.1 From cca7ec933a6e86c4d2b9aa446e47bd33b5cd243b Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Tue, 20 May 2008 14:59:38 +0000 Subject: be extra careful about libICE and libSM prerequisites since many distros have separate development packages for these. complain if they aren't installed. CCMAIL: kde-buildsystem@kde.org svn path=/trunk/KDE/kdelibs/; revision=810372 --- modules/FindX11.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 27702886..bb48035c 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -295,6 +295,14 @@ IF (UNIX) SET(X11_SM_FOUND TRUE) ENDIF(X11_SM_LIB AND X11_SM_INCLUDE_PATH) + IF(NOT X11_ICE_FOUND) + MESSAGE(FATAL_ERROR "\nThe X11 Inter-Client Exchange (ICE) Library could not be found.\nCannot continue. Please install libICE.\n") + ENDIF(NOT X11_ICE_FOUND) + + IF(NOT X11_SM_FOUND) + MESSAGE(FATAL_ERROR "\nThe X11 Session Management (SM) Library could not be found.\nCannot contineu. Please install libSM.\n") + ENDIF(NOT X11_SM_FOUND) + # Deprecated variable for backwards compatibility with CMake 1.4 IF (X11_X11_INCLUDE_PATH AND X11_LIBRARIES) SET(X11_FOUND 1) -- cgit v1.2.1 From 0244558bd2d1162f1b0b027900b964aceac14ee2 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Tue, 20 May 2008 21:28:28 +0000 Subject: revert exiting if SM or ICE isn't found. svn path=/trunk/KDE/kdelibs/; revision=810500 --- modules/FindX11.cmake | 8 -------- 1 file changed, 8 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index bb48035c..27702886 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -295,14 +295,6 @@ IF (UNIX) SET(X11_SM_FOUND TRUE) ENDIF(X11_SM_LIB AND X11_SM_INCLUDE_PATH) - IF(NOT X11_ICE_FOUND) - MESSAGE(FATAL_ERROR "\nThe X11 Inter-Client Exchange (ICE) Library could not be found.\nCannot continue. Please install libICE.\n") - ENDIF(NOT X11_ICE_FOUND) - - IF(NOT X11_SM_FOUND) - MESSAGE(FATAL_ERROR "\nThe X11 Session Management (SM) Library could not be found.\nCannot contineu. Please install libSM.\n") - ENDIF(NOT X11_SM_FOUND) - # Deprecated variable for backwards compatibility with CMake 1.4 IF (X11_X11_INCLUDE_PATH AND X11_LIBRARIES) SET(X11_FOUND 1) -- cgit v1.2.1 From 8fcd46e47bcdcc5722fbbd98e3c0d86088e086a1 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 16 Aug 2008 11:41:12 +0000 Subject: partly sync with cmake: /usr/pkg is searched anyway, initialize the _LIBRARIES and INCLUDE_DIR variables Alex svn path=/trunk/KDE/kdelibs/; revision=847811 --- modules/FindX11.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 27702886..2d6d24e9 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -48,7 +48,6 @@ IF (UNIX) SET(CMAKE_FIND_FRAMEWORK NEVER) SET(X11_INC_SEARCH_PATH /usr/pkg/xorg/include - /usr/pkg/include /usr/X11R6/include /usr/X11R7/include /usr/include/X11 @@ -59,7 +58,6 @@ IF (UNIX) SET(X11_LIB_SEARCH_PATH /usr/pkg/xorg/lib - /usr/pkg/lib /usr/X11R6/lib /usr/X11R7/lib /usr/openwin/lib @@ -134,6 +132,7 @@ IF (UNIX) GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH) ENDIF(X11_X11_LIB) + SET(X11_INCLUDE_DIR) # start with empty list IF(X11_X11_INCLUDE_PATH) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) ENDIF(X11_X11_INCLUDE_PATH) @@ -152,6 +151,7 @@ IF (UNIX) SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xshape_INCLUDE_PATH}) ENDIF(X11_Xshape_INCLUDE_PATH) + SET(X11_LIBRARIES) # start with empty list IF(X11_X11_LIB) SET(X11_LIBRARIES ${X11_LIBRARIES} ${X11_X11_LIB}) ENDIF(X11_X11_LIB) -- cgit v1.2.1 From 839685fc2c89d7ff5aa2b9609f83d2e4a02a7167 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 15 Nov 2009 18:31:14 +0000 Subject: Document X11_X11_LIB and X11_X11_INCLUDE_PATH Alex svn path=/trunk/KDE/kdelibs/; revision=1049732 --- modules/FindX11.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindX11.cmake') diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 2d6d24e9..f2f879dc 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -7,6 +7,7 @@ # and also the following more fine grained variables: # X11_ICE_INCLUDE_PATH, X11_ICE_LIB, X11_ICE_FOUND # X11_SM_INCLUDE_PATH, X11_SM_LIB, X11_SM_FOUND +# X11_X11_INCLUDE_PATH, X11_X11_LIB # X11_Xaccessrules_INCLUDE_PATH, X11_Xaccess_FOUND # X11_Xaccessstr_INCLUDE_PATH, X11_Xaccess_FOUND # X11_Xau_INCLUDE_PATH, X11_Xau_LIB, X11_Xau_FOUND -- cgit v1.2.1