diff options
| author | Friedrich W. H. Kossebau <kossebau@kde.org> | 2010-04-27 22:53:42 +0000 |
|---|---|---|
| committer | Friedrich W. H. Kossebau <kossebau@kde.org> | 2010-04-27 22:53:42 +0000 |
| commit | 5e7664ba04465f7156c4f564c3cc22ebf523caef (patch) | |
| tree | 5074fa2470ca0839e86f21c30ecc2dbfa9d96d57 /modules/FindPopplerQt4.cmake | |
| parent | a70b982dc99bea80b4eb8cec1347a16873f9769e (diff) | |
| download | extra-cmake-modules-5e7664ba04465f7156c4f564c3cc22ebf523caef.tar.gz extra-cmake-modules-5e7664ba04465f7156c4f564c3cc22ebf523caef.tar.bz2 | |
changed: use PkgConfig instead of UsePkgConfig
svn path=/trunk/KDE/kdelibs/; revision=1119905
Diffstat (limited to 'modules/FindPopplerQt4.cmake')
| -rw-r--r-- | modules/FindPopplerQt4.cmake | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/modules/FindPopplerQt4.cmake b/modules/FindPopplerQt4.cmake index 04911bbd..f2a59b8c 100644 --- a/modules/FindPopplerQt4.cmake +++ b/modules/FindPopplerQt4.cmake @@ -16,25 +16,24 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if(NOT WIN32) - include(UsePkgConfig) +find_package(PkgConfig) +pkg_check_modules(PC_POPPLERQT4 QUIET poppler-qt4) - pkgconfig(poppler-qt4 _PopplerQt4IncDir _PopplerQt4LinkDir _PopplerQt4LinkFlags _PopplerQt4Cflags) +set(POPPLER_QT4_DEFINITIONS ${PC_POPPLERQT4_CFLAGS_OTHER}) - set(POPPLER_QT4_DEFINITIONS ${_PopplerQt4Cflags}) -endif(NOT WIN32) - -find_path(POPPLER_QT4_INCLUDE_DIR +find_path(POPPLER_QT4_INCLUDE_DIR NAMES poppler-qt4.h + HINTS ${PC_POPPLERQT4_INCLUDEDIR} PATH_SUFFIXES poppler/qt4 poppler - HINTS ${_PopplerQt4IncDir} ) -find_library(POPPLER_QT4_LIBRARIES +find_library(POPPLER_QT4_LIBRARY NAMES poppler-qt4 - HINTS ${_PopplerQt4LinkDir} + HINTS ${PC_POPPLERQT4_LIBDIR} ) +set(POPPLER_QT4_LIBRARIES ${POPPLER_QT4_LIBRARY}) + if (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES) set(POPPLER_QT4_FOUND TRUE) else (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES) |