summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2014-08-09 17:07:16 (GMT)
committerAlbert Astals Cid <aacid@kde.org>2014-08-09 17:07:16 (GMT)
commitbc155c6842249ee90ff470a6055e605bb34d72c6 (patch)
tree8368e8f98ab217acc8ce7e4b93cea9869bcf6420
parent643026fa650e07c7123ded900692275f625fb714 (diff)
Poppler-qt4 -> 5
-rw-r--r--cmake/modules/FindPoppler.cmake93
-rw-r--r--generators/CMakeLists.txt6
2 files changed, 16 insertions, 83 deletions
diff --git a/cmake/modules/FindPoppler.cmake b/cmake/modules/FindPoppler.cmake
index 6389a62..98895ec 100644
--- a/cmake/modules/FindPoppler.cmake
+++ b/cmake/modules/FindPoppler.cmake
@@ -24,7 +24,7 @@ if(NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
include(FindPkgConfig)
- pkg_check_modules(_pc_poppler poppler-qt4)
+ pkg_check_modules(_pc_poppler poppler-qt5)
if(_pc_poppler_FOUND)
if(NOT "${_pc_poppler_VERSION}" VERSION_GREATER 0.5.3)
set(_poppler_version_bad TRUE)
@@ -35,15 +35,15 @@ endif(NOT WIN32)
if(NOT _poppler_version_bad)
set(POPPLER_FOUND FALSE)
- find_library(POPPLER_LIBRARY poppler-qt4
+ find_library(POPPLER_LIBRARY poppler-qt5
HINTS ${_pc_poppler_LIBRARY_DIRS}
)
- find_path(POPPLER_INCLUDE_DIR poppler-qt4.h
+ find_path(POPPLER_INCLUDE_DIR poppler-qt5.h
HINTS ${_pc_poppler_INCLUDE_DIRS}
- PATH_SUFFIXES poppler/qt4
+ PATH_SUFFIXES poppler/qt5
)
- find_path(POPPLER_INCLUDE_DIR_core qt4/poppler-qt4.h
+ find_path(POPPLER_INCLUDE_DIR_core qt5/poppler-qt5.h
HINTS ${_pc_poppler_INCLUDE_DIRS}
PATH_SUFFIXES poppler
)
@@ -57,67 +57,11 @@ endif(NOT _poppler_version_bad)
if (POPPLER_FOUND)
include(CheckCXXSourceCompiles)
- # check whether we're using poppler 0.6
set(CMAKE_REQUIRED_INCLUDES ${POPPLER_INCLUDE_DIR} ${QT_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${POPPLER_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY})
check_cxx_source_compiles("
-#include <poppler-qt4.h>
-int main()
-{
- Poppler::Document::RenderHint hint = Poppler::Document::TextHinting;
- return 0;
-}
-" HAVE_POPPLER_0_12_1)
-
-check_cxx_source_compiles("
-#include <poppler-qt4.h>
-
-void debugFunction(const QString &message, const QVariant &closure)
-{
-}
-
-int main()
-{
- Poppler::setDebugErrorFunction(debugFunction, QVariant());
- return 0;
-}
-" HAVE_POPPLER_0_16)
-
-check_cxx_source_compiles("
-#include <poppler-qt4.h>
-#include <poppler-media.h>
-
-int main()
-{
- Poppler::ScreenAnnotation *annot = 0;
- Poppler::LinkRendition *link = 0;
- const Poppler::LinkMovie::Operation operation = Poppler::LinkMovie::Play;
- return 0;
-}
-" HAVE_POPPLER_0_20)
-
-check_cxx_source_compiles("
-#include <poppler-qt4.h>
-#include <poppler-annotation.h>
-#include <poppler-link.h>
-
-int main()
-{
- Poppler::MovieObject *movie = 0;
- Poppler::Document *doc = 0;
- movie->showPosterImage();
-
- const Poppler::Annotation::AdditionalActionType type = Poppler::Annotation::PageOpeningAction;
- const Poppler::LinkRendition::RenditionAction action = Poppler::LinkRendition::NoRendition;
- const Poppler::Document::FormType formType = doc->formType();
-
- return 0;
-}
-" HAVE_POPPLER_0_22)
-
-check_cxx_source_compiles("
-#include <poppler-qt4.h>
+#include <poppler-qt5.h>
int main()
{
Poppler::Document::RenderHint hint = Poppler::Document::ThinLineSolid;
@@ -126,7 +70,7 @@ int main()
" HAVE_POPPLER_0_24)
check_cxx_source_compiles("
-#include <poppler-qt4.h>
+#include <poppler-qt5.h>
int main()
{
Poppler::Page *p = 0;
@@ -141,30 +85,19 @@ int main()
set(popplerVersionMessage "0.28")
elseif (HAVE_POPPLER_0_24)
set(popplerVersionMessage "0.24")
- elseif (HAVE_POPPLER_0_22)
- set(popplerVersionMessage "0.22")
- elseif (HAVE_POPPLER_0_20)
- set(popplerVersionMessage "0.20")
- elseif (HAVE_POPPLER_0_16)
- set(popplerVersionMessage "0.16")
- elseif (HAVE_POPPLER_0_12_1)
- set(popplerVersionMessage "0.12.1")
- else (HAVE_POPPLER_0_28)
- set(popplerVersionMessage "0.5.4")
- endif (HAVE_POPPLER_0_28)
+ endif ()
if (NOT Poppler_FIND_QUIETLY)
- message(STATUS "Found Poppler-Qt4: ${POPPLER_LIBRARY}, (>= ${popplerVersionMessage})")
+ message(STATUS "Found Poppler-Qt5: ${POPPLER_LIBRARY}, (>= ${popplerVersionMessage})")
endif (NOT Poppler_FIND_QUIETLY)
else (POPPLER_FOUND)
if (Poppler_FIND_REQUIRED)
- message(FATAL_ERROR "Could NOT find Poppler-Qt4")
+ message(FATAL_ERROR "Could NOT find Poppler-Qt5")
endif (Poppler_FIND_REQUIRED)
- message(STATUS "Could not find OPTIONAL package Poppler-Qt4")
+ message(STATUS "Could not find OPTIONAL package Poppler-Qt5")
endif (POPPLER_FOUND)
# ensure that they are cached
-set(POPPLER_INCLUDE_DIR ${POPPLER_INCLUDE_DIR} CACHE INTERNAL "The Poppler-Qt4 include path")
-set(POPPLER_LIBRARY ${POPPLER_LIBRARY} CACHE INTERNAL "The Poppler-Qt4 library")
-set(HAVE_POPPLER_0_12_1 ${HAVE_POPPLER_0_12_1} CACHE INTERNAL "Whether the version of Poppler-Qt4 is >= 0.12.1")
+set(POPPLER_INCLUDE_DIR ${POPPLER_INCLUDE_DIR} CACHE INTERNAL "The Poppler-Qt5 include path")
+set(POPPLER_LIBRARY ${POPPLER_LIBRARY} CACHE INTERNAL "The Poppler-Qt5 library")
endif(POPPLER_INCLUDE_DIR AND POPPLER_LIBRARY)
diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index 4e0e028..92340da 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -1,7 +1,7 @@
set(LIBSPECTRE_MINIMUM_VERSION "0.2")
find_package(Poppler "0.12.1")
-set_package_properties("Poppler-Qt4" PROPERTIES
+set_package_properties("Poppler-Qt5" PROPERTIES
DESCRIPTION "A PDF rendering library"
URL "http://poppler.freedesktop.org"
TYPE RECOMMENDED
@@ -79,9 +79,9 @@ set_package_properties("libqmobipocket" PROPERTIES
# let's enable the generators properly configured
-if(POPPLER_FOUND AND HAVE_POPPLER_0_12_1)
+if(POPPLER_FOUND)
add_subdirectory(poppler)
-endif(POPPLER_FOUND AND HAVE_POPPLER_0_12_1)
+endif(POPPLER_FOUND)
if(LIBSPECTRE_FOUND)
add_subdirectory(spectre)