diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindENCHANT.cmake | 45 | ||||
| -rw-r--r-- | modules/FindGSSAPI.cmake | 2 | ||||
| -rw-r--r-- | modules/FindKMetaData.cmake | 4 | ||||
| -rw-r--r-- | modules/FindKonto.cmake | 4 | ||||
| -rw-r--r-- | modules/FindPlasma.cmake | 18 | ||||
| -rw-r--r-- | modules/FindX11.cmake | 18 |
6 files changed, 35 insertions, 56 deletions
diff --git a/modules/FindENCHANT.cmake b/modules/FindENCHANT.cmake index 1a12fe6b..0871a78a 100644 --- a/modules/FindENCHANT.cmake +++ b/modules/FindENCHANT.cmake @@ -15,33 +15,26 @@ if (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) # in cache already - SET(ENCHANT_FOUND TRUE) + set(ENCHANT_FOUND TRUE) else (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) -IF (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - INCLUDE(UsePkgConfig) - - PKGCONFIG(enchant _ENCHANTIncDir _ENCHANTLinkDir _ENCHANTLinkFlags _ENCHANTCflags) - - set(ENCHANT_DEFINITIONS ${_ENCHANTCflags}) -ENDIF (NOT WIN32) - FIND_PATH(ENCHANT_INCLUDE_DIR enchant++.h - ${_ENCHANTIncDir} - /usr/include - /usr/include/enchant - /usr/local/include - /usr/local/include/enchant - ) - - FIND_LIBRARY(ENCHANT_LIBRARIES NAMES enchant - PATHS - ${_ENCHANTLinkDir} - /usr/lib - /usr/local/lib - ) - + IF (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + INCLUDE(UsePkgConfig) + + PKGCONFIG(enchant _ENCHANTIncDir _ENCHANTLinkDir _ENCHANTLinkFlags _ENCHANTCflags) + + set(ENCHANT_DEFINITIONS ${_ENCHANTCflags}) + ENDIF (NOT WIN32) + + find_path(ENCHANT_INCLUDE_DIR enchant++.h + PATH_SUFFIXES enchant + PATHS ${_ENCHANTIncDir} ) + + find_library(ENCHANT_LIBRARIES NAMES enchant + PATHS ${_ENCHANTLinkDir} ) + if (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) set(ENCHANT_FOUND TRUE) endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) @@ -56,6 +49,6 @@ ENDIF (NOT WIN32) endif (ENCHANT_FIND_REQUIRED) endif (ENCHANT_FOUND) - MARK_AS_ADVANCED(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES) + mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES) endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index daf16113..64182fdc 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -20,8 +20,6 @@ IF(GSSAPI_LIBS AND GSSAPI_FLAVOR) ELSE(GSSAPI_LIBS AND GSSAPI_FLAVOR) FIND_PROGRAM(KRB5_CONFIG NAMES krb5-config PATHS - /usr/bin - /usr/local/bin /opt/local/bin ) diff --git a/modules/FindKMetaData.cmake b/modules/FindKMetaData.cmake index eef6727c..9cb59542 100644 --- a/modules/FindKMetaData.cmake +++ b/modules/FindKMetaData.cmake @@ -10,8 +10,6 @@ FIND_PATH(KMETADATA_INCLUDE_DIR NAMES kmetadata/kmetadata.h PATHS - /usr/include - /usr/local/include ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ) @@ -21,8 +19,6 @@ FIND_LIBRARY(KMETADATA_LIBRARIES kmetadata kmetadatatools PATHS - /usr/lib - /usr/local/lib ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} ) diff --git a/modules/FindKonto.cmake b/modules/FindKonto.cmake index 4af6348b..2042719c 100644 --- a/modules/FindKonto.cmake +++ b/modules/FindKonto.cmake @@ -15,8 +15,6 @@ FIND_PATH(KONTO_INCLUDES NAMES konto/class.h PATHS - /usr/include - /usr/local/include ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ) @@ -25,8 +23,6 @@ FIND_LIBRARY(KONTO_LIBRARIES NAMES konto PATHS - /usr/lib - /usr/local/lib ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} ) diff --git a/modules/FindPlasma.cmake b/modules/FindPlasma.cmake index 00e8a084..f256a453 100644 --- a/modules/FindPlasma.cmake +++ b/modules/FindPlasma.cmake @@ -14,18 +14,14 @@ if (PLASMA_INCLUDE_DIR) endif (PLASMA_INCLUDE_DIR) -FIND_PATH(PLASMA_INCLUDE_DIR NAMES plasma/kpanelapplet.h - PATHS - ${INCLUDE_INSTALL_DIR} - /usr/include - /usr/local/include +find_path(PLASMA_INCLUDE_DIR NAMES plasma/kpanelapplet.h + PATHS + ${INCLUDE_INSTALL_DIR} ) -FIND_LIBRARY(PLASMA_LIBRARIES NAMES plasma - PATHS - ${LIB_INSTALL_DIR} - /usr/lib - /usr/local/lib +find_library(PLASMA_LIBRARIES NAMES plasma + PATHS + ${LIB_INSTALL_DIR} ) if (PLASMA_LIBRARIES AND PLASMA_INCLUDE_DIR) set(PLASMA_FOUND TRUE) @@ -41,4 +37,4 @@ else (PLASMA_FOUND) endif (Plasma_FIND_REQUIRED) endif (PLASMA_FOUND) -MARK_AS_ADVANCED(PLASMA_INCLUDE_DIR PLASMA_LIBRARIES) +mark_as_advanced(PLASMA_INCLUDE_DIR PLASMA_LIBRARIES) 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. |