From 94f1cae6cea102d3a05acfea00646235f2900060 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 4 Feb 2020 23:47:23 +0000 Subject: [PATCH] okular: replace use of Poppler with PopplerQt4 CMake module Signed-off-by: Ivailo Monev --- okular/generators/CMakeLists.txt | 8 ++++---- okular/generators/poppler/CMakeLists.txt | 13 ++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/okular/generators/CMakeLists.txt b/okular/generators/CMakeLists.txt index 1975c8c9..1f9ee3e1 100644 --- a/okular/generators/CMakeLists.txt +++ b/okular/generators/CMakeLists.txt @@ -2,8 +2,8 @@ include (MacroLogFeature) set(LIBSPECTRE_MINIMUM_VERSION "0.2") -macro_optional_find_package(Poppler) -macro_log_feature(POPPLER_FOUND "Poppler-Qt4" "A PDF rendering library" "http://poppler.freedesktop.org" FALSE "0.28.0" "Support for PDF files in okular.") +macro_optional_find_package(PopplerQt4) +macro_log_feature(POPPLER_QT4_FOUND "Poppler-Qt4" "A PDF rendering library" "http://poppler.freedesktop.org" FALSE "0.28.0" "Support for PDF files in okular.") macro_optional_find_package(LibSpectre) macro_log_feature(LIBSPECTRE_FOUND "libspectre" "A PostScript rendering library" "http://libspectre.freedesktop.org/wiki/" FALSE "${LIBSPECTRE_MINIMUM_VERSION}" "Support for PS files in okular.") @@ -30,9 +30,9 @@ macro_log_feature(QMOBIPOCKET_FOUND "libqmobipocket" "A library for reading Mobi # let's enable the generators properly configured -if(POPPLER_FOUND) +if(POPPLER_QT4_FOUND) add_subdirectory(poppler) -endif(POPPLER_FOUND) +endif(POPPLER_QT4_FOUND) if(LIBSPECTRE_FOUND) add_subdirectory(spectre) diff --git a/okular/generators/poppler/CMakeLists.txt b/okular/generators/poppler/CMakeLists.txt index 86ea45e8..fa0b3abd 100644 --- a/okular/generators/poppler/CMakeLists.txt +++ b/okular/generators/poppler/CMakeLists.txt @@ -1,22 +1,17 @@ add_subdirectory( conf ) -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}) +set(CMAKE_REQUIRED_INCLUDES ${POPPLER_QT4_INCLUDE_DIR} ${QT_INCLUDE_DIR}) +set(CMAKE_REQUIRED_LIBRARIES ${POPPLER_QT4_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY}) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config-okular-poppler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-okular-poppler.h ) -# Can be multiple include directories for poppler -separate_arguments(POPPLER_INCLUDE_DIR) -foreach(_include_dir ${POPPLER_INCLUDE_DIR}) - include_directories(${_include_dir}) -endforeach(_include_dir ${POPPLER_INCLUDE_DIR}) - include_directories( ${CMAKE_BINARY_DIR}/okular ${CMAKE_CURRENT_SOURCE_DIR}/../.. + ${POPPLER_QT4_INCLUDE_DIR} ) ########### next target ############### @@ -40,7 +35,7 @@ kde4_add_kcfg_files(okularGenerator_poppler_PART_SRCS conf/pdfsettings.kcfgc ) kde4_add_plugin(okularGenerator_poppler ${okularGenerator_poppler_PART_SRCS}) -target_link_libraries(okularGenerator_poppler ${POPPLER_LIBRARY} okularcore ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARIES}) +target_link_libraries(okularGenerator_poppler ${POPPLER_QT4_LIBRARIES} okularcore ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARIES}) install(TARGETS okularGenerator_poppler DESTINATION ${PLUGIN_INSTALL_DIR}) -- 2.11.0