diff options
| -rw-r--r-- | modules/FindAGG.cmake | 30 | ||||
| -rw-r--r-- | modules/FindBlitz.cmake | 8 | ||||
| -rw-r--r-- | modules/FindBlueZ.cmake | 10 | ||||
| -rw-r--r-- | modules/FindFontconfig.cmake | 11 | ||||
| -rw-r--r-- | modules/FindGObject.cmake | 27 | ||||
| -rw-r--r-- | modules/FindGStreamer.cmake | 20 | ||||
| -rw-r--r-- | modules/FindLCMS.cmake | 28 | ||||
| -rw-r--r-- | modules/FindLibArt.cmake | 4 | ||||
| -rw-r--r-- | modules/FindLibXml2.cmake | 8 | ||||
| -rw-r--r-- | modules/FindLibXslt.cmake | 6 | ||||
| -rw-r--r-- | modules/FindPCRE.cmake | 14 | ||||
| -rw-r--r-- | modules/FindQCA2.cmake | 37 | ||||
| -rw-r--r-- | modules/FindQImageBlitz.cmake | 8 | ||||
| -rw-r--r-- | modules/FindSqlite.cmake | 10 | ||||
| -rw-r--r-- | modules/FindStrigi.cmake | 1 | ||||
| -rw-r--r-- | modules/FindUSB.cmake | 6 | ||||
| -rw-r--r-- | modules/FindXine.cmake | 2 | ||||
| -rw-r--r-- | modules/FindXmms.cmake | 39 |
18 files changed, 141 insertions, 128 deletions
diff --git a/modules/FindAGG.cmake b/modules/FindAGG.cmake index ea7905bd..94d68da4 100644 --- a/modules/FindAGG.cmake +++ b/modules/FindAGG.cmake @@ -14,24 +14,24 @@ if (AGG_INCLUDE_DIR AND AGG_LIBRARIES) # in cache already - SET(AGG_FOUND TRUE) + set(AGG_FOUND TRUE) else (AGG_INCLUDE_DIR AND AGG_LIBRARIES) -IF (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - find_package(PkgConfig) - pkg_check_modules(AGG libagg) - - set(AGG_DEFINITIONS ${AGG_CFLAGS}) -ENDIF (NOT WIN32) - FIND_PATH(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h - ${AGG_INCLUDE_DIRS} + if (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + find_package(PkgConfig) + pkg_check_modules(PC_AGG libagg) + + set(AGG_DEFINITIONS ${PC_AGG_CFLAGS_OTHER}) + endif (NOT WIN32) + + find_path(AGG_INCLUDE_DIR agg2/agg_pixfmt_gray.h + PATHS ${PC_AGG_INCLUDEDIR} ${PC_AGG_INCLUDE_DIRS} ) - FIND_LIBRARY(AGG_LIBRARIES NAMES agg - PATHS - ${AGG_LIBRARY_DIRS} + find_library(AGG_LIBRARIES NAMES agg + PATHS ${PC_AGG_LIBDIR} ${PC_AGG_LIBRARY_DIRS} ) if (AGG_INCLUDE_DIR AND AGG_LIBRARIES) @@ -48,6 +48,6 @@ ENDIF (NOT WIN32) endif (AGG_FIND_REQUIRED) endif (AGG_FOUND) - MARK_AS_ADVANCED(AGG_INCLUDE_DIR AGG_LIBRARIES) + mark_as_advanced(AGG_INCLUDE_DIR AGG_LIBRARIES) endif (AGG_INCLUDE_DIR AND AGG_LIBRARIES) diff --git a/modules/FindBlitz.cmake b/modules/FindBlitz.cmake index ed439458..2427999e 100644 --- a/modules/FindBlitz.cmake +++ b/modules/FindBlitz.cmake @@ -23,7 +23,7 @@ if (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) - pkg_check_modules(BLITZ qimageblitz) + pkg_check_modules(PC_BLITZ qimageblitz) endif (NOT WIN32) find_path(BLITZ_INCLUDES @@ -32,7 +32,8 @@ find_path(BLITZ_INCLUDES PATH_SUFFIXES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/include - ${BLITZ_INCLUDE_DIRS} + ${PC_BLITZ_INCLUDEDIR} + ${PC_BLITZ_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ) @@ -42,7 +43,8 @@ find_library_with_debug(BLITZ_LIBRARIES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/lib - ${BLITZ_LIBRARY_DIRS} + ${PC_BLITZ_LIBRARY_DIRS} + ${PC_BLITZ_LIBDIR} ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} ) diff --git a/modules/FindBlueZ.cmake b/modules/FindBlueZ.cmake index 8e1a2fc4..47161868 100644 --- a/modules/FindBlueZ.cmake +++ b/modules/FindBlueZ.cmake @@ -20,20 +20,22 @@ endif ( BLUEZ_INCLUDE_DIR AND BLUEZ_LIBRARIES ) if( NOT WIN32 ) find_package(PkgConfig) - pkg_check_modules(BLUEZ bluez) + pkg_check_modules(PC_BLUEZ bluez) - set(BLUEZ_DEFINITIONS ${BLUEZ_CFLAGS}) + set(BLUEZ_DEFINITIONS ${PC_BLUEZ_CFLAGS_OTHER}) endif( NOT WIN32 ) FIND_PATH(BLUEZ_INCLUDE_DIR NAMES bluetooth/bluetooth.h PATHS - ${BLUEZ_INCLUDE_DIRS} + ${PC_BLUEZ_INCLUDEDIR} + ${PC_BLUEZ_INCLUDE_DIRS} /usr/X11/include ) FIND_LIBRARY(BLUEZ_LIBRARIES NAMES bluetooth PATHS - ${BLUEZ_LIBRARY_DIRS} + ${PC_BLUEZ_LIBDIR} + ${PC_BLUEZ_LIBRARY_DIRS} ) include(FindPackageHandleStandardArgs) diff --git a/modules/FindFontconfig.cmake b/modules/FindFontconfig.cmake index 10fd0734..268a61ae 100644 --- a/modules/FindFontconfig.cmake +++ b/modules/FindFontconfig.cmake @@ -2,6 +2,7 @@ # Once done this will define # # FONTCONFIG_FOUND - system has Fontconfig +# FONTCONFIG_INCLUDE_DIR - The include directory to use for the fontconfig headers # FONTCONFIG_LIBRARIES - Link these to use FONTCONFIG # FONTCONFIG_DEFINITIONS - Compiler switches required for using FONTCONFIG @@ -22,20 +23,22 @@ else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) - pkg_check_modules(FONTCONFIG fontconfig) + pkg_check_modules(PC_FONTCONFIG fontconfig) - set(FONTCONFIG_DEFINITIONS ${FONTCONFIG_CFLAGS}) + set(FONTCONFIG_DEFINITIONS ${PC_FONTCONFIG_CFLAGS_OTHER}) endif (NOT WIN32) find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h PATHS - ${FONTCONFIG_INCLUDE_DIRS} + ${PC_FONTCONFIG_INCLUDEDIR} + ${PC_FONTCONFIG_INCLUDE_DIRS} /usr/X11/include ) find_library(FONTCONFIG_LIBRARIES NAMES fontconfig PATHS - ${FONTCONFIG_LIBRARY_DIRS} + ${PC_FONTCONFIG_LIBDIR} + ${PC_FONTCONFIG_LIBRARY_DIRS} ) include(FindPackageHandleStandardArgs) diff --git a/modules/FindGObject.cmake b/modules/FindGObject.cmake index 3774b914..538cad5f 100644 --- a/modules/FindGObject.cmake +++ b/modules/FindGObject.cmake @@ -19,37 +19,40 @@ ENDIF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES) IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - find_package(PkgConfig) - pkg_check_modules(GOBJECT gobject-2.0) + FIND_PACKAGE(PkgConfig) + PKG_CHECK_MODULES(PC_GOBJECT gobject-2.0) #MESSAGE(STATUS "DEBUG: GObject include directory = ${GOBJECT_INCLUDE_DIRS}") #MESSAGE(STATUS "DEBUG: GObject link directory = ${GOBJECT_LIBRARY_DIRS}") #MESSAGE(STATUS "DEBUG: GObject CFlags = ${GOBJECT_CFLAGS}") - SET(GOBJECT_DEFINITIONS ${GOBJECT_CFLAGS}) + SET(GOBJECT_DEFINITIONS ${PC_GOBJECT_CFLAGS_OTHER}) ENDIF (NOT WIN32) FIND_PATH(GOBJECT_INCLUDE_DIR gobject.h PATHS - ${GOBJECT_INCLUDE_DIRS} - ${GOBJECT_INCLUDE_DIRS}/glib-2.0/gobject/ - /usr/include/glib-2.0/gobject/ - #PATH_SUFFIXES gst + ${PC_GOBJECT_INCLUDEDIR} + ${PC_GOBJECT_INCLUDE_DIRS} + PATH_SUFFIXES glib-2.0/gobject/ ) FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0 PATHS - ${GOBJECT_LIBRARY_DIRS} + ${PC_GOBJECT_LIBDIR} + ${PC_GOBJECT_LIBRARY_DIRS} ) FIND_LIBRARY(_GModuleLibs NAMES gmodule-2.0 PATHS - ${GOBJECT_LIBRARY_DIRS} + ${PC_GOBJECT_LIBDIR} + ${PC_GOBJECT_LIBRARY_DIRS} ) FIND_LIBRARY(_GThreadLibs NAMES gthread-2.0 PATHS - ${GOBJECT_LIBRARY_DIRS} + ${PC_GOBJECT_LIBDIR} + ${PC_GOBJECT_LIBRARY_DIRS} ) FIND_LIBRARY(_GLibs NAMES glib-2.0 PATHS - ${GOBJECT_LIBRARY_DIRS} + ${PC_GOBJECT_LIBDIR} + ${PC_GOBJECT_LIBRARY_DIRS} ) SET( GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs} ) @@ -71,4 +74,4 @@ ELSE (GOBJECT_FOUND) ENDIF(GObject_FIND_REQUIRED) ENDIF (GOBJECT_FOUND) -MARK_AS_ADVANCED(GOBJECT_INCLUDE_DIR GOBJECT_LIBRARIES) +MARK_AS_ADVANCED(GOBJECT_INCLUDE_DIR _GObjectLibs _GModuleLibs _GThreadLibs _GLibs) diff --git a/modules/FindGStreamer.cmake b/modules/FindGStreamer.cmake index 291ddc3b..b87e37fd 100644 --- a/modules/FindGStreamer.cmake +++ b/modules/FindGStreamer.cmake @@ -20,33 +20,37 @@ ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - find_package(PkgConfig) - pkg_check_modules(GSTREAMER gstreamer-0.10) + FIND_PACKAGE(PkgConfig) + PKG_CHECK_MODULES(PC_GSTREAMER gstreamer-0.10) #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_INCLUDE_DIRS}") #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}") - #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS}") - SET(GSTREAMER_DEFINITIONS ${GSTREAMER_CFLAGS}) + #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS_OTHER}") + SET(GSTREAMER_DEFINITIONS ${PC_GSTREAMER_CFLAGS_OTHER}) ENDIF (NOT WIN32) FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h PATHS - ${GSTREAMER_INCLUDE_DIRS} + ${PC_GSTREAMER_INCLUDEDIR} + ${PC_GSTREAMER_INCLUDE_DIRS} #PATH_SUFFIXES gst ) FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10 PATHS - ${GSTREAMER_LIBRARY_DIRS} + ${PC_GSTREAMER_LIBDIR} + ${PC_GSTREAMER_LIBRARY_DIRS} ) FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10 PATHS - ${GSTREAMER_LIBRARY_DIRS} + ${PC_GSTREAMER_LIBDIR} + ${PC_GSTREAMER_LIBRARY_DIRS} ) FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10 PATHS - ${GSTREAMER_LIBRARY_DIRS} + ${PC_GSTREAMER_LIBDIR} + ${PC_GSTREAMER_LIBRARY_DIRS} ) IF (GSTREAMER_INCLUDE_DIR) diff --git a/modules/FindLCMS.cmake b/modules/FindLCMS.cmake index 97ac7ef1..52109933 100644 --- a/modules/FindLCMS.cmake +++ b/modules/FindLCMS.cmake @@ -9,31 +9,23 @@ # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls if(NOT WIN32) -find_package(PkgConfig) -pkg_check_modules(LCMS lcms) -set(LCMS_DEFINITIONS ${LCMS_CFLAGS}) + find_package(PkgConfig) + pkg_check_modules(PC_LCMS lcms) + set(LCMS_DEFINITIONS ${PC_LCMS_CFLAGS_OTHER}) endif(NOT WIN32) find_path(LCMS_INCLUDE_DIR lcms.h - ${LCMS_INCLUDE_DIRS} - ${CMAKE_INSTALL_PREFIX}/include - /usr/include/lcms - /usr/include/liblcms1 - /usr/local/include/lcms - NO_DEFAULT_PATH -) -find_path(LCMS_INCLUDE_DIR lcms.h + PATHS + ${PC_LCMS_INCLUDEDIR} + ${PC_LCMS_INCLUDE_DIRS} + PATH_SUFFIXES lcms liblcms1 ) find_library(LCMS_LIBRARIES NAMES lcms liblcms lcms-1 liblcms-1 PATHS - ${LCMS_LIBRARY_DIRS} - ${CMAKE_INSTALL_PREFIX}/lib - /usr/lib/lcms - /usr/local/lib/lcms - NO_DEFAULT_PATH -) -find_library(LCMS_LIBRARIES NAMES lcms liblcms lcms-1 liblcms-1 + ${PC_LCMS_LIBDIR} + ${PC_LCMS_LIBRARY_DIRS} + PATH_SUFFIXES lcms ) if(LCMS_INCLUDE_DIR AND LCMS_LIBRARIES) diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake index d886eeb1..99eaff65 100644 --- a/modules/FindLibArt.cmake +++ b/modules/FindLibArt.cmake @@ -26,17 +26,19 @@ else (LIBART_INCLUDE_DIR AND LIBART_LIBRARIES) pkg_check_modules(PC_LIBART libart-2.0) ######### ?? where is this used ?? ############### - set(LIBART_DEFINITIONS ${PC_LIBART_CFLAGS}) + set(LIBART_DEFINITIONS ${PC_LIBART_CFLAGS_OTHER}) ENDIF (NOT WIN32) FIND_PATH(LIBART_INCLUDE_DIR NAMES libart_lgpl/libart.h PATHS + ${PC_LIBART_INCLUDEDIR} ${PC_LIBART_INCLUDE_DIRS} PATH_SUFFIXES libart-2.0 ) FIND_LIBRARY(LIBART_LIBRARIES NAMES art_lgpl_2 PATHS + ${PC_LIBART_LIBDIR} ${PC_LIBART_LIBRARY_DIRS} ) diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 1849e099..04a73857 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -23,17 +23,19 @@ IF (NOT WIN32) # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) pkg_check_modules(PC_LIBXML libxml-2.0) - SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS}) + SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER}) ENDIF (NOT WIN32) FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h - PATHS + HINTS + ${PC_LIBXML_INCLUDEDIR} ${PC_LIBXML_INCLUDE_DIRS} PATH_SUFFIXES libxml2 ) FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 - PATHS + HINTS + ${PC_LIBXML_LIBDIR} ${PC_LIBXML_LIBRARY_DIRS} ) diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake index ff0110c7..3a1bcd46 100644 --- a/modules/FindLibXslt.cmake +++ b/modules/FindLibXslt.cmake @@ -23,20 +23,24 @@ IF (NOT WIN32) # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) pkg_check_modules(PC_XSLT libxslt) - SET(LIBXSLT_DEFINITIONS ${PC_XSLT_CFLAGS}) + SET(LIBXSLT_DEFINITIONS ${PC_XSLT_CFLAGS_OTHER}) ENDIF (NOT WIN32) FIND_PATH(LIBXSLT_INCLUDE_DIR libxslt/xslt.h + PATHS + ${PC_XSLT_INCLUDEDIR} ${PC_XSLT_INCLUDE_DIRS} ) FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt PATHS + ${PC_XSLT_LIBDIR} ${PC_XSLT_LIBRARY_DIRS} ) FIND_LIBRARY(LIBEXSLT_LIBRARIES NAMES exslt libexslt PATHS + ${PC_XSLT_LIBDIR} ${PC_XSLT_LIBRARY_DIRS} ) diff --git a/modules/FindPCRE.cmake b/modules/FindPCRE.cmake index 80fdfd9f..efba0652 100644 --- a/modules/FindPCRE.cmake +++ b/modules/FindPCRE.cmake @@ -22,17 +22,19 @@ if (NOT WIN32) # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) - pkg_check_modules(PCRE libpcre) + pkg_check_modules(PC_PCRE libpcre) - set(PCRE_DEFINITIONS ${PCRE_CFLAGS}) + set(PCRE_DEFINITIONS ${PC_PCRE_CFLAGS_OTHER}) -endif (NOT WIN32) +endif (NOT WIN32) -find_path(PCRE_INCLUDE_DIR pcre.h PATHS ${PCRE_INCLUDE_DIRS} PATH_SUFFIXES pcre) +find_path(PCRE_INCLUDE_DIR pcre.h + HINTS ${PC_PCRE_INCLUDEDIR} ${PC_PCRE_INCLUDE_DIRS} + PATH_SUFFIXES pcre) -find_library(PCRE_PCRE_LIBRARY NAMES pcre PATHS ${PCRE_LIBRARY_DIRS}) +find_library(PCRE_PCRE_LIBRARY NAMES pcre HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS}) -find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix PATHS ${PCRE_LIBRARY_DIRS}) +find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY ) diff --git a/modules/FindQCA2.cmake b/modules/FindQCA2.cmake index fe4b0766..6b82a965 100644 --- a/modules/FindQCA2.cmake +++ b/modules/FindQCA2.cmake @@ -27,33 +27,20 @@ else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES) if (NOT WIN32) find_package(PkgConfig) pkg_check_modules(PC_QCA2 qca2) - - # If pkgconfig found QCA2, get the full path to the library using find_library() - # but only in the path reported by pkgconfig. - # Otherwise do a normal search. - if(PC_QCA2_FOUND) - set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS}) - set(QCA2_INCLUDE_DIR ${PC_QCA2_INCLUDE_DIRS}) - find_library(QCA2_LIBRARIES NAMES qca - PATHS - ${PC_QCA2_LIBDIR} - NO_DEFAULT_PATH - ) - else(PC_QCA2_FOUND) - find_library(QCA2_LIBRARIES NAMES qca ) - find_path(QCA2_INCLUDE_DIR qca.h PATH_SUFFIXES QtCrypto) - endif(PC_QCA2_FOUND) - - else (NOT WIN32) - find_library_with_debug(QCA2_LIBRARIES - WIN32_DEBUG_POSTFIX d - NAMES qca) - - find_path(QCA2_INCLUDE_DIR qca.h PATH_SUFFIXES QtCrypto) + set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER}) endif (NOT WIN32) - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(QCA2 DEFAULT_MSG QCA2_LIBRARIES QCA2_INCLUDE_DIR) + find_library_with_debug(QCA2_LIBRARIES + WIN32_DEBUG_POSTFIX d + HINTS ${PC_QCA2_LIBDIR} ${PC_QCA2_LIBRARY_DIRS} + NAMES qca) + + find_path(QCA2_INCLUDE_DIR qca.h + HINTS ${PC_QCA2_INCLUDEDIR} ${PC_QCA2_INCLUDE_DIRS} + PATH_SUFFIXES QtCrypto) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(QCA2 DEFAULT_MSG QCA2_LIBRARIES QCA2_INCLUDE_DIR) mark_as_advanced(QCA2_INCLUDE_DIR QCA2_LIBRARIES) diff --git a/modules/FindQImageBlitz.cmake b/modules/FindQImageBlitz.cmake index 8cb56432..9e31c047 100644 --- a/modules/FindQImageBlitz.cmake +++ b/modules/FindQImageBlitz.cmake @@ -20,7 +20,7 @@ if (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) - pkg_check_modules(QIMAGEBLITZ qimageblitz) + pkg_check_modules(PC_QIMAGEBLITZ qimageblitz) endif (NOT WIN32) find_path(QIMAGEBLITZ_INCLUDES @@ -29,7 +29,8 @@ find_path(QIMAGEBLITZ_INCLUDES PATH_SUFFIXES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/include - ${QIMAGEBLITZ_INCLUDE_DIRS} + ${PC_QIMAGEBLITZ_INCLUDEDIR} + ${PC_QIMAGEBLITZ_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ) @@ -39,7 +40,8 @@ find_library_with_debug(QIMAGEBLITZ_LIBRARIES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/lib - ${QIMAGEBLITZ_LIBRARY_DIRS} + ${PC_QIMAGEBLITZ_LIBDIR} + ${PC_QIMAGEBLITZ_LIBRARY_DIRS} ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} ) diff --git a/modules/FindSqlite.cmake b/modules/FindSqlite.cmake index 3dd53351..d010719f 100644 --- a/modules/FindSqlite.cmake +++ b/modules/FindSqlite.cmake @@ -20,19 +20,21 @@ endif ( SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES ) if( NOT WIN32 ) find_package(PkgConfig) - pkg_check_modules(SQLITE sqlite3) + pkg_check_modules(PC_SQLITE sqlite3) - set(SQLITE_DEFINITIONS ${SQLITE_CFLAGS}) + set(SQLITE_DEFINITIONS ${PC_SQLITE_CFLAGS_OTHER}) endif( NOT WIN32 ) FIND_PATH(SQLITE_INCLUDE_DIR NAMES sqlite3.h PATHS - ${SQLITE_INCLUDE_DIRS} + ${PC_SQLITE_INCLUDEDIR} + ${PC_SQLITE_INCLUDE_DIRS} ) FIND_LIBRARY(SQLITE_LIBRARIES NAMES sqlite3 PATHS - ${SQLITE_LIBRARY_DIRS} + ${PC_SQLITE_LIBDIR} + ${PC_SQLITE_LIBRARY_DIRS} ) include(FindPackageHandleStandardArgs) diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index 391b4189..52a9aa66 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -8,7 +8,6 @@ # STRIGI_LINE_ANALYZER_PREFIX - strigi plugin prefix # STRIGI_THROUGH_ANALYZER_PREFIX - strigi plugin prefix - if(NOT STRIGI_MIN_VERSION) set(STRIGI_MIN_VERSION "0.5.9") endif(NOT STRIGI_MIN_VERSION) diff --git a/modules/FindUSB.cmake b/modules/FindUSB.cmake index 862388b9..566cdd8e 100644 --- a/modules/FindUSB.cmake +++ b/modules/FindUSB.cmake @@ -21,14 +21,14 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) - pkg_check_modules(LIBUSB libusb) + pkg_check_modules(PC_LIBUSB libusb) ENDIF(NOT WIN32) FIND_PATH(LIBUSB_INCLUDE_DIR usb.h - PATHS ${LIBUSB_INCLUDE_DIRS} ) + PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb - PATHS ${LIBUSB_LIBRARY_DIRS} ) + PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) diff --git a/modules/FindXine.cmake b/modules/FindXine.cmake index 9452e781..1223851b 100644 --- a/modules/FindXine.cmake +++ b/modules/FindXine.cmake @@ -27,11 +27,13 @@ endif (PKG_CONFIG_FOUND) find_path(XINE_INCLUDE_DIR NAMES xine.h HINTS # HINTS is new in cmake 2.6. These dirs will be preferred over the default ones ${PC_LIBXINE_INCLUDEDIR} + ${PC_LIBXINE_INCLUDE_DIRS} ) find_library(XINE_LIBRARY NAMES xine HINTS ${PC_LIBXINE_LIBDIR} + ${PC_LIBXINE_LIBRARY_DIRS} ) find_program(XINECONFIG_EXECUTABLE NAMES xine-config diff --git a/modules/FindXmms.cmake b/modules/FindXmms.cmake index 8d42b12f..c43893fb 100644 --- a/modules/FindXmms.cmake +++ b/modules/FindXmms.cmake @@ -1,9 +1,10 @@ # Search xmms -## Once done this will define +# Once done this will define # # XMMS_FOUND - system has xmms # XMMS_INCLUDE_DIRS - the xmms include directory -# XMMS_LDFLAGS - Link these to use xmms +# XMMS_LIBRARIES - Link these to use xmms +# XMMS_LDFLAGS - for compatibility only, same as XMMS_LIBRARIES # Copyright (c) 2006, 2007 Laurent Montel, <montel@kde.org> # Copyright (c) 2007 Allen Winter <winter@kde.org> @@ -11,29 +12,33 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (XMMS_INCLUDE_DIRS AND XMMS_LDFLAGS) +if (XMMS_INCLUDE_DIRS AND XMMS_LIBRARIES) # in cache already - SET(XMMS_FOUND TRUE) + set(XMMS_FOUND TRUE) -else (XMMS_INCLUDE_DIRS AND XMMS_LDFLAGS) - IF (NOT WIN32) +else (XMMS_INCLUDE_DIRS AND XMMS_LIBRARIES) + if (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls find_package(PkgConfig) - pkg_check_modules(XMMS xmms) - ENDIF(NOT WIN32) + pkg_check_modules(PC_XMMS xmms) + endif(NOT WIN32) - FIND_PATH(XMMS_INCLUDE_DIRS xmmsctrl.h - PATHS ${_XMMSIncDir} PATH_SUFFIXES xmms) + find_path(XMMS_INCLUDE_DIRS xmmsctrl.h + PATHS ${PC_XMMS_INCLUDEDIR} ${PC_XMMS_INCLUDE_DIRS} + PATH_SUFFIXES xmms) - FIND_LIBRARY(XMMS_LDFLAGS NAMES xmms - PATHS ${_XMMSLinkDir}) + find_library(XMMS_LIBRARIES NAMES xmms + PATHS ${PC_XMMS_LIBDIR} ${PC_XMMS_LIBRARY_DIRS}) - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xmms DEFAULT_MSG - XMMS_LDFLAGS XMMS_INCLUDE_DIRS) + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Xmms DEFAULT_MSG + XMMS_LIBRARIES XMMS_INCLUDE_DIRS) - MARK_AS_ADVANCED(XMMS_INCLUDE_DIRS XMMS_LDFLAGS) + mark_as_advanced(XMMS_INCLUDE_DIRS XMMS_LIBRARIES) -endif (XMMS_INCLUDE_DIRS AND XMMS_LDFLAGS) +endif (XMMS_INCLUDE_DIRS AND XMMS_LIBRARIES) + +# for compatibility +set(XMMS_LDFLAGS ${XMMS_LIBRARIES}) |