diff options
| author | David Faure <faure@kde.org> | 2008-03-13 11:59:31 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2008-03-13 11:59:31 +0000 |
| commit | 33dc0baf857b81826301dff74c458d61e7abc8ed (patch) | |
| tree | 8d8f8f7dd1aba0091803d19d1a0316f2136fefe9 | |
| parent | 9ecab260c304c4d9e9488a33b05d387e63256832 (diff) | |
| download | extra-cmake-modules-33dc0baf857b81826301dff74c458d61e7abc8ed.tar.gz extra-cmake-modules-33dc0baf857b81826301dff74c458d61e7abc8ed.tar.bz2 | |
Also use pkgconfig to find QImageBlitz, since it installs a .pc file.
svn path=/trunk/KDE/kdelibs/; revision=785147
| -rw-r--r-- | modules/FindBlitz.cmake | 12 | ||||
| -rw-r--r-- | modules/FindQImageBlitz.cmake | 9 |
2 files changed, 21 insertions, 0 deletions
diff --git a/modules/FindBlitz.cmake b/modules/FindBlitz.cmake index 84abc6ad..a26cf5c8 100644 --- a/modules/FindBlitz.cmake +++ b/modules/FindBlitz.cmake @@ -1,3 +1,6 @@ +################################################################ +########## DEPRECATED, use FindQImageBlitz instead ############# +################################################################ # - Try to find blitz lib # Once done this will define # @@ -16,12 +19,20 @@ if (BLITZ_INCLUDES AND BLITZ_LIBRARIES) set(Blitz_FIND_QUIETLY TRUE) endif (BLITZ_INCLUDES AND BLITZ_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(qimageblitz _QIMAGEBLITZ_INCLUDEDIR _QIMAGEBLITZ_LIBDIR _dummyLinkFlags _dummyCflags) +endif (NOT WIN32) + find_path(BLITZ_INCLUDES NAMES qimageblitz.h PATH_SUFFIXES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/include + ${_QIMAGEBLITZ_INCLUDEDIR} ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ) @@ -31,6 +42,7 @@ find_library_with_debug(BLITZ_LIBRARIES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/lib + ${_QIMAGEBLITZ_LIBDIR} ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} ) diff --git a/modules/FindQImageBlitz.cmake b/modules/FindQImageBlitz.cmake index 6021e5ea..ae610f1e 100644 --- a/modules/FindQImageBlitz.cmake +++ b/modules/FindQImageBlitz.cmake @@ -16,12 +16,20 @@ if (QIMAGEBLITZ_INCLUDES AND QIMAGEBLITZ_LIBRARIES) set(QImageBlitz_FIND_QUIETLY TRUE) endif (QIMAGEBLITZ_INCLUDES AND QIMAGEBLITZ_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(qimageblitz _QIMAGEBLITZ_INCLUDEDIR _QIMAGEBLITZ_LIBDIR _dummyLinkFlags _dummyCflags) +endif (NOT WIN32) + find_path(QIMAGEBLITZ_INCLUDES NAMES qimageblitz.h PATH_SUFFIXES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/include + ${_QIMAGEBLITZ_INCLUDEDIR} ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ) @@ -31,6 +39,7 @@ find_library_with_debug(QIMAGEBLITZ_LIBRARIES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/lib + ${_QIMAGEBLITZ_LIBDIR} ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} ) |