diff options
| author | Laurent Montel <montel@kde.org> | 2008-11-24 08:18:08 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2008-11-24 08:18:08 +0000 |
| commit | 75930de900d9bd42883dee356b69616e23e033cb (patch) | |
| tree | 334d668a685f946fd7db21160845ce7f5ed38934 | |
| parent | 75908891c6843f01bcf544c3759e0cf7e4cd3bb3 (diff) | |
| download | extra-cmake-modules-75930de900d9bd42883dee356b69616e23e033cb.tar.gz extra-cmake-modules-75930de900d9bd42883dee356b69616e23e033cb.tar.bz2 | |
Port to use new PkgConfig
Why FindBlitz.cmake ? I think that we can remove it
svn path=/trunk/KDE/kdelibs/; revision=888266
| -rw-r--r-- | modules/FindBlitz.cmake | 9 | ||||
| -rw-r--r-- | modules/FindQImageBlitz.cmake | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/modules/FindBlitz.cmake b/modules/FindBlitz.cmake index a26cf5c8..ed439458 100644 --- a/modules/FindBlitz.cmake +++ b/modules/FindBlitz.cmake @@ -22,8 +22,8 @@ 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) + find_package(PkgConfig) + pkg_check_modules(BLITZ qimageblitz) endif (NOT WIN32) find_path(BLITZ_INCLUDES @@ -32,7 +32,7 @@ find_path(BLITZ_INCLUDES PATH_SUFFIXES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/include - ${_QIMAGEBLITZ_INCLUDEDIR} + ${BLITZ_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ) @@ -42,7 +42,7 @@ find_library_with_debug(BLITZ_LIBRARIES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/lib - ${_QIMAGEBLITZ_LIBDIR} + ${BLITZ_LIBRARY_DIRS} ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} ) @@ -50,5 +50,4 @@ find_library_with_debug(BLITZ_LIBRARIES include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Blitz DEFAULT_MSG BLITZ_INCLUDES BLITZ_LIBRARIES) - mark_as_advanced(BLITZ_INCLUDES BLITZ_LIBRARIES) diff --git a/modules/FindQImageBlitz.cmake b/modules/FindQImageBlitz.cmake index ae610f1e..8cb56432 100644 --- a/modules/FindQImageBlitz.cmake +++ b/modules/FindQImageBlitz.cmake @@ -19,8 +19,8 @@ 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) + find_package(PkgConfig) + pkg_check_modules(QIMAGEBLITZ qimageblitz) endif (NOT WIN32) find_path(QIMAGEBLITZ_INCLUDES @@ -29,7 +29,7 @@ find_path(QIMAGEBLITZ_INCLUDES PATH_SUFFIXES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/include - ${_QIMAGEBLITZ_INCLUDEDIR} + ${QIMAGEBLITZ_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ) @@ -39,7 +39,7 @@ find_library_with_debug(QIMAGEBLITZ_LIBRARIES qimageblitz PATHS $ENV{QIMAGEBLITZDIR}/lib - ${_QIMAGEBLITZ_LIBDIR} + ${QIMAGEBLITZ_LIBRARY_DIRS} ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR} ) |