From 2cb05ed201dc81563a82e7b3888d4f9d6624229e Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 23 Apr 2007 16:53:13 +0000 Subject: Use by koffice/kdegraphics svn path=/trunk/KDE/kdelibs/; revision=657255 --- modules/FindPopplerQt4.cmake | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 modules/FindPopplerQt4.cmake (limited to 'modules/FindPopplerQt4.cmake') diff --git a/modules/FindPopplerQt4.cmake b/modules/FindPopplerQt4.cmake new file mode 100644 index 00000000..a67bde44 --- /dev/null +++ b/modules/FindPopplerQt4.cmake @@ -0,0 +1,55 @@ +# - Try to find the Qt4 binding of the Poppler library +# Once done this will define +# +# POPPLER_QT4_FOUND - system has poppler-qt4 +# POPPLER_QT4_INCLUDE_DIR - the poppler-qt4 include directory +# POPPLER_QT4_LIBRARIES - Link these to use poppler-qt4 +# POPPLER_QT4_DEFINITIONS - Compiler switches required for using poppler-qt4 +# + +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls + +# Copyright (c) 2006, Wilfried Huss, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +if(NOT WIN32) +INCLUDE(UsePkgConfig) + +PKGCONFIG(poppler-qt4 _PopplerQt4IncDir _PopplerQt4LinkDir _PopplerQt4LinkFlags _PopplerQt4Cflags) + +set(POPPLER_QT4_DEFINITIONS ${_PopplerQt4Cflags}) +endif(NOT WIN32) + +FIND_PATH(POPPLER_QT4_INCLUDE_DIR poppler-qt4.h + ${_PopplerQt4IncDir}/poppler + /usr/include/poppler + /usr/local/include/poppler +) + +FIND_LIBRARY(POPPLER_QT4_LIBRARIES poppler-qt4 + ${_PopplerQt4LinkDir} + /usr/lib + /usr/local/lib +) + +if (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES) + set(POPPLER_QT4_FOUND TRUE) +else (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES) + set(POPPLER_QT4_FOUND FALSE) +endif (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES) + +if (POPPLER_QT4_FOUND) + if (NOT PopplerQt4_FIND_QUIETLY) + message(STATUS "Found poppler-qt4: library: ${POPPLER_QT4_LIBRARIES}, include path: ${POPPLER_QT4_INCLUDE_DIR}") + endif (NOT PopplerQt4_FIND_QUIETLY) +else (POPPLER_QT4_FOUND) + if (PopplerQt4_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find poppler-qt4") + endif (PopplerQt4_FIND_REQUIRED) +endif (POPPLER_QT4_FOUND) + +MARK_AS_ADVANCED(POPPLER_QT4_INCLUDE_DIR POPPLER_QT4_LIBRARIES) -- cgit v1.2.1 From 2afd73c8c91ecd46eeb8310ce96f47475656c5f9 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 5 Jun 2007 02:34:00 +0000 Subject: -don't list the standard dirs Alex svn path=/trunk/KDE/kdelibs/; revision=671575 --- modules/FindPopplerQt4.cmake | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'modules/FindPopplerQt4.cmake') diff --git a/modules/FindPopplerQt4.cmake b/modules/FindPopplerQt4.cmake index a67bde44..b4ee4086 100644 --- a/modules/FindPopplerQt4.cmake +++ b/modules/FindPopplerQt4.cmake @@ -17,25 +17,23 @@ if(NOT WIN32) -INCLUDE(UsePkgConfig) - -PKGCONFIG(poppler-qt4 _PopplerQt4IncDir _PopplerQt4LinkDir _PopplerQt4LinkFlags _PopplerQt4Cflags) - -set(POPPLER_QT4_DEFINITIONS ${_PopplerQt4Cflags}) + include(UsePkgConfig) + + pkgconfig(poppler-qt4 _PopplerQt4IncDir _PopplerQt4LinkDir _PopplerQt4LinkFlags _PopplerQt4Cflags) + + set(POPPLER_QT4_DEFINITIONS ${_PopplerQt4Cflags}) endif(NOT WIN32) -FIND_PATH(POPPLER_QT4_INCLUDE_DIR poppler-qt4.h - ${_PopplerQt4IncDir}/poppler - /usr/include/poppler - /usr/local/include/poppler -) - -FIND_LIBRARY(POPPLER_QT4_LIBRARIES poppler-qt4 +find_path(POPPLER_QT4_INCLUDE_DIR + NAMES poppler-qt4.h + PATH_SUFFIXES poppler + PATHS ${_PopplerQt4IncDir} +) + +find_library(POPPLER_QT4_LIBRARIES poppler-qt4 ${_PopplerQt4LinkDir} - /usr/lib - /usr/local/lib ) - + if (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES) set(POPPLER_QT4_FOUND TRUE) else (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES) @@ -52,4 +50,4 @@ else (POPPLER_QT4_FOUND) endif (PopplerQt4_FIND_REQUIRED) endif (POPPLER_QT4_FOUND) -MARK_AS_ADVANCED(POPPLER_QT4_INCLUDE_DIR POPPLER_QT4_LIBRARIES) +mark_as_advanced(POPPLER_QT4_INCLUDE_DIR POPPLER_QT4_LIBRARIES) -- cgit v1.2.1 From 1f207c6a9f1990a5f96a7e2d0a4acce08f58be9f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 27 Feb 2009 16:47:51 +0000 Subject: fix poppler detection for openSUSE (https://bugzilla.novell.com/show_bug.cgi?id=480485) svn path=/trunk/KDE/kdelibs/; revision=932963 --- modules/FindPopplerQt4.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindPopplerQt4.cmake') diff --git a/modules/FindPopplerQt4.cmake b/modules/FindPopplerQt4.cmake index b4ee4086..fbc1820c 100644 --- a/modules/FindPopplerQt4.cmake +++ b/modules/FindPopplerQt4.cmake @@ -26,7 +26,7 @@ endif(NOT WIN32) find_path(POPPLER_QT4_INCLUDE_DIR NAMES poppler-qt4.h - PATH_SUFFIXES poppler + PATH_SUFFIXES poppler/qt4 poppler PATHS ${_PopplerQt4IncDir} ) -- cgit v1.2.1 From 2c993c081c491ff0f686890212d7b01c801c01b1 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 11 Aug 2009 08:51:12 +0000 Subject: Use HINTS, not PATHS for pkg-config discovered paths svn path=/trunk/KDE/kdelibs/; revision=1009923 --- modules/FindPopplerQt4.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'modules/FindPopplerQt4.cmake') diff --git a/modules/FindPopplerQt4.cmake b/modules/FindPopplerQt4.cmake index fbc1820c..04911bbd 100644 --- a/modules/FindPopplerQt4.cmake +++ b/modules/FindPopplerQt4.cmake @@ -27,11 +27,12 @@ endif(NOT WIN32) find_path(POPPLER_QT4_INCLUDE_DIR NAMES poppler-qt4.h PATH_SUFFIXES poppler/qt4 poppler - PATHS ${_PopplerQt4IncDir} + HINTS ${_PopplerQt4IncDir} ) -find_library(POPPLER_QT4_LIBRARIES poppler-qt4 - ${_PopplerQt4LinkDir} +find_library(POPPLER_QT4_LIBRARIES + NAMES poppler-qt4 + HINTS ${_PopplerQt4LinkDir} ) if (POPPLER_QT4_INCLUDE_DIR AND POPPLER_QT4_LIBRARIES) -- cgit v1.2.1 From 5e7664ba04465f7156c4f564c3cc22ebf523caef Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Tue, 27 Apr 2010 22:53:42 +0000 Subject: changed: use PkgConfig instead of UsePkgConfig svn path=/trunk/KDE/kdelibs/; revision=1119905 --- modules/FindPopplerQt4.cmake | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'modules/FindPopplerQt4.cmake') 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) -- cgit v1.2.1