diff options
author | Allen Winter <winter@kde.org> | 2006-03-20 21:05:37 +0000 |
---|---|---|
committer | Allen Winter <winter@kde.org> | 2006-03-20 21:05:37 +0000 |
commit | 191846e3e21c697c28bd5c8a166edeb4072161e3 (patch) | |
tree | dd41ca62b221ce0b3936c1dc9d518a01e6359bc6 /modules/FindX11.cmake | |
parent | 659abe0d63dd8d5a979d6584fdf9dfb7b9b6c6ff (diff) | |
download | extra-cmake-modules-191846e3e21c697c28bd5c8a166edeb4072161e3.tar.gz extra-cmake-modules-191846e3e21c697c28bd5c8a166edeb4072161e3.tar.bz2 |
minor cleanups: indenting, adding newline to end of file, etc.
svn path=/trunk/KDE/kdelibs/; revision=520790
Diffstat (limited to 'modules/FindX11.cmake')
-rw-r--r-- | modules/FindX11.cmake | 146 |
1 files changed, 73 insertions, 73 deletions
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) |