mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-28 20:24:09 +00:00
Switch to kf6
This commit is contained in:
Nicolas Fella
Carl Schwan
parent
5b0ebb0f4c
commit
c29f0fec54
|
|
@ -16,7 +16,7 @@ set(OKULAR_UI "" CACHE STRING "Which Okular user interface to build. Possible va
|
|||
option(FORCE_NOT_REQUIRED_DEPENDENCIES "List (semicolon-separated) of dependencies that will be downgraded from REQUIRED to RECOMMENDED")
|
||||
|
||||
if (ANDROID AND (NOT FORCE_NOT_REQUIRED_DEPENDENCIES) AND (NOT FORCE_NOT_REQUIRED_DEPENDENCIES STREQUAL ""))
|
||||
set(FORCE_NOT_REQUIRED_DEPENDENCIES "KF5Wallet;KF5DocTools;Qt6Qml;TIFF;JPEG;LibSpectre;KF5KExiv2;CHM;LibZip;DjVuLibre;EPub;Discount;")
|
||||
set(FORCE_NOT_REQUIRED_DEPENDENCIES "KF6Wallet;KF6DocTools;Qt6Qml;TIFF;JPEG;LibSpectre;KF6KExiv2;CHM;LibZip;DjVuLibre;EPub;Discount;")
|
||||
endif()
|
||||
|
||||
function(set_okular_optional_package_properties _name _props)
|
||||
|
|
@ -111,7 +111,7 @@ ecm_setup_qtplugin_macro_names(
|
|||
PACKAGE_SETUP_AUTOMOC_VARIABLES
|
||||
)
|
||||
|
||||
find_package(KF5 ${KF_REQUIRED_VERSION} REQUIRED COMPONENTS
|
||||
find_package(KF6 ${KF_REQUIRED_VERSION} REQUIRED COMPONENTS
|
||||
Archive
|
||||
Bookmarks
|
||||
Completion
|
||||
|
|
@ -124,17 +124,17 @@ find_package(KF5 ${KF_REQUIRED_VERSION} REQUIRED COMPONENTS
|
|||
WindowSystem
|
||||
)
|
||||
|
||||
find_package(KF5Wallet ${KF_REQUIRED_VERSION})
|
||||
set_okular_optional_package_properties(KF5Wallet PROPERTIES
|
||||
find_package(KF6Wallet ${KF_REQUIRED_VERSION})
|
||||
set_okular_optional_package_properties(KF6Wallet PROPERTIES
|
||||
PURPOSE "Required for document storing passwords in secure wallets.")
|
||||
if(KF5Wallet_FOUND)
|
||||
if(KF6Wallet_FOUND)
|
||||
set(HAVE_KWALLET 1)
|
||||
else()
|
||||
set(HAVE_KWALLET 0)
|
||||
endif()
|
||||
|
||||
find_package(KF5DocTools ${KF_REQUIRED_VERSION})
|
||||
set_okular_optional_package_properties(KF5DocTools PROPERTIES
|
||||
find_package(KF6DocTools ${KF_REQUIRED_VERSION})
|
||||
set_okular_optional_package_properties(KF6DocTools PROPERTIES
|
||||
PURPOSE "Required for compiling and installing the user documentation.")
|
||||
|
||||
find_package(Qt6Qml)
|
||||
|
|
@ -155,13 +155,13 @@ if (BUILD_DESKTOP)
|
|||
else()
|
||||
set(HAVE_DBUS 0)
|
||||
endif()
|
||||
find_package(KF5 ${KF_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash IconThemes TextWidgets)
|
||||
find_package(KF6 ${KF_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash IconThemes TextWidgets)
|
||||
|
||||
find_package(KF5Purpose)
|
||||
set_okular_optional_package_properties(KF5Purpose PROPERTIES
|
||||
find_package(KF6Purpose)
|
||||
set_okular_optional_package_properties(KF6Purpose PROPERTIES
|
||||
DESCRIPTION "A framework for services and actions integration"
|
||||
PURPOSE "Required for enabling the share menu.")
|
||||
if (KF5Purpose_FOUND)
|
||||
if (KF6Purpose_FOUND)
|
||||
set(HAVE_PURPOSE 1)
|
||||
else()
|
||||
set(HAVE_PURPOSE 0)
|
||||
|
|
@ -179,14 +179,14 @@ endif()
|
|||
|
||||
if (BUILD_MOBILE)
|
||||
find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Qml Quick)
|
||||
find_package(KF5Kirigami2)
|
||||
set_package_properties(KF5Kirigami2 PROPERTIES
|
||||
find_package(KF6Kirigami2)
|
||||
set_package_properties(KF6Kirigami2 PROPERTIES
|
||||
DESCRIPTION "A QtQuick based components set"
|
||||
PURPOSE "Required at runtime by the mobile app"
|
||||
TYPE RUNTIME
|
||||
)
|
||||
find_package(KF5KirigamiAddons)
|
||||
set_package_properties(KF5KirigamiAddons PROPERTIES
|
||||
find_package(KF6KirigamiAddons)
|
||||
set_package_properties(KF6KirigamiAddons PROPERTIES
|
||||
DESCRIPTION "A set of widgets for Kirigami along with code to support them"
|
||||
PURPOSE "Required at runtime by the mobile app"
|
||||
TYPE RUNTIME
|
||||
|
|
@ -194,10 +194,10 @@ if (BUILD_MOBILE)
|
|||
endif()
|
||||
|
||||
if(NOT WIN32 AND NOT ANDROID AND NOT APPLE)
|
||||
find_package(KF5 ${KF_REQUIRED_VERSION} REQUIRED COMPONENTS
|
||||
find_package(KF6 ${KF_REQUIRED_VERSION} REQUIRED COMPONENTS
|
||||
Activities
|
||||
)
|
||||
set_package_properties("KF5Activities" PROPERTIES
|
||||
set_package_properties("KF6Activities" PROPERTIES
|
||||
DESCRIPTION "Activities interface library"
|
||||
URL "https://api.kde.org/frameworks/kactivities/html/"
|
||||
PURPOSE "Required for Activities integration.")
|
||||
|
|
@ -250,8 +250,8 @@ set_okular_optional_package_properties(LibSpectre PROPERTIES
|
|||
URL "https://libspectre.freedesktop.org"
|
||||
PURPOSE "Support for PS files in okular.")
|
||||
|
||||
find_package(KF5KExiv2 CONFIG)
|
||||
set_okular_optional_package_properties(KF5KExiv2 PROPERTIES
|
||||
find_package(KF6KExiv2 CONFIG)
|
||||
set_okular_optional_package_properties(KF6KExiv2 PROPERTIES
|
||||
DESCRIPTION "Wrapper around Exiv2 library"
|
||||
URL "https://commits.kde.org/libkexiv2"
|
||||
PURPOSE "Support for exif rotation in image files.")
|
||||
|
|
@ -283,8 +283,8 @@ set_okular_optional_package_properties(EPub PROPERTIES
|
|||
URL "http://sourceforge.net/projects/ebook-tools"
|
||||
PURPOSE "Support for EPub documents in Okular.")
|
||||
|
||||
find_package(QMobipocket "2" CONFIG)
|
||||
set_okular_optional_package_properties(QMobipocket PROPERTIES
|
||||
find_package(QMobipocket6 "2" CONFIG)
|
||||
set_okular_optional_package_properties(QMobiPocket6 PROPERTIES
|
||||
DESCRIPTION "A library for reading Mobipocket documents"
|
||||
URL "https://commits.kde.org/kdegraphics-mobipocket"
|
||||
PURPOSE "Support for Mobipocket documents in Okular.")
|
||||
|
|
@ -323,7 +323,7 @@ if(BUILD_TESTING)
|
|||
add_subdirectory( autotests )
|
||||
endif()
|
||||
|
||||
if(KF5DocTools_FOUND)
|
||||
if(KF6DocTools_FOUND)
|
||||
add_subdirectory(doc)
|
||||
endif()
|
||||
|
||||
|
|
@ -451,19 +451,19 @@ target_link_libraries(okularcore
|
|||
PRIVATE
|
||||
${OKULAR_IOKIT}
|
||||
${SHLWAPI}
|
||||
KF5::Archive
|
||||
KF5::KIOCore
|
||||
KF5::KIOWidgets
|
||||
KF5::I18n
|
||||
KF5::ThreadWeaver
|
||||
KF5::Bookmarks
|
||||
KF6::Archive
|
||||
KF6::KIOCore
|
||||
KF6::KIOWidgets
|
||||
KF6::I18n
|
||||
KF6::ThreadWeaver
|
||||
KF6::Bookmarks
|
||||
Qt6::Svg
|
||||
${MATH_LIB}
|
||||
ZLIB::ZLIB
|
||||
PUBLIC # these are included from the installed headers
|
||||
KF5::CoreAddons
|
||||
KF5::XmlGui
|
||||
KF5::ConfigGui
|
||||
KF6::CoreAddons
|
||||
KF6::XmlGui
|
||||
KF6::ConfigGui
|
||||
Qt6::PrintSupport
|
||||
Qt6::Widgets
|
||||
)
|
||||
|
|
@ -472,8 +472,8 @@ if (Phonon4Qt6_FOUND)
|
|||
endif()
|
||||
|
||||
|
||||
if (KF5Wallet_FOUND)
|
||||
target_link_libraries(okularcore PRIVATE KF5::Wallet)
|
||||
if (KF6Wallet_FOUND)
|
||||
target_link_libraries(okularcore PRIVATE KF6::Wallet)
|
||||
endif()
|
||||
if (TARGET Qt6::Qml)
|
||||
target_sources(okularcore PRIVATE
|
||||
|
|
@ -590,16 +590,16 @@ generate_export_header(okularpart BASE_NAME okularpart)
|
|||
target_link_libraries(okularpart okularcore
|
||||
${MATH_LIB}
|
||||
Qt6::Svg
|
||||
KF5::Archive
|
||||
KF5::Bookmarks
|
||||
KF5::I18n
|
||||
KF5::IconThemes
|
||||
KF5::ItemViews
|
||||
KF5::KIOCore
|
||||
KF5::KIOWidgets
|
||||
KF5::Parts
|
||||
KF5::WindowSystem
|
||||
KF5::TextWidgets
|
||||
KF6::Archive
|
||||
KF6::Bookmarks
|
||||
KF6::I18n
|
||||
KF6::IconThemes
|
||||
KF6::ItemViews
|
||||
KF6::KIOCore
|
||||
KF6::KIOWidgets
|
||||
KF6::Parts
|
||||
KF6::WindowSystem
|
||||
KF6::TextWidgets
|
||||
)
|
||||
if (TARGET Qt6::DBus)
|
||||
target_link_libraries(okularpart Qt6::DBus)
|
||||
|
|
@ -608,12 +608,12 @@ if (Phonon4Qt6_FOUND)
|
|||
target_link_libraries(okularpart Phonon::phonon4qt6)
|
||||
endif()
|
||||
|
||||
if(KF5Wallet_FOUND)
|
||||
target_link_libraries(okularpart KF5::Wallet)
|
||||
if(KF6Wallet_FOUND)
|
||||
target_link_libraries(okularpart KF6::Wallet)
|
||||
endif()
|
||||
|
||||
if (KF5Purpose_FOUND)
|
||||
target_link_libraries(okularpart KF5::PurposeWidgets)
|
||||
if (KF6Purpose_FOUND)
|
||||
target_link_libraries(okularpart KF6::PurposeWidgets)
|
||||
endif()
|
||||
|
||||
set_target_properties(okularpart PROPERTIES PREFIX "")
|
||||
|
|
@ -635,7 +635,7 @@ install(FILES okular.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
|
|||
install(FILES okular.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
|
||||
|
||||
ki18n_install(po)
|
||||
if(KF5DocTools_FOUND)
|
||||
if(KF6DocTools_FOUND)
|
||||
kdoctools_install(po)
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -411,13 +411,13 @@ add_definitions(-DTRANSLATION_DOMAIN="okular_magic")
|
|||
|
||||
macro_optional_find_package(Okular)
|
||||
|
||||
include_directories( ${OKULAR_INCLUDE_DIR} ${KF5_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
include_directories( ${OKULAR_INCLUDE_DIR} ${KF6_INCLUDE_DIR} ${QT_INCLUDES} )
|
||||
|
||||
########### next target ###############
|
||||
|
||||
set( okularGenerator_magic_PART_SRCS generator_magic.cpp )
|
||||
|
||||
target_link_libraries( okularGenerator_magic PRIVATE okularcore KF5::I18n KF5::KIOCore )
|
||||
target_link_libraries( okularGenerator_magic PRIVATE okularcore KF6::I18n KF6::KIOCore )
|
||||
|
||||
install( TARGETS okularGenerator_magic DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ include(CMakeFindDependencyMacro)
|
|||
find_dependency(Qt5Core @QT_REQUIRED_VERSION@)
|
||||
find_dependency(Qt5PrintSupport @QT_REQUIRED_VERSION@)
|
||||
find_dependency(Qt5Widgets @QT_REQUIRED_VERSION@)
|
||||
find_dependency(KF5CoreAddons @KF5_REQUIRED_VERSION@)
|
||||
find_dependency(KF5Config @KF5_REQUIRED_VERSION@)
|
||||
find_dependency(KF5XmlGui @KF5_REQUIRED_VERSION@)
|
||||
find_dependency(KF6CoreAddons @KF6_REQUIRED_VERSION@)
|
||||
find_dependency(KF6Config @KF6_REQUIRED_VERSION@)
|
||||
find_dependency(KF6XmlGui @KF6_REQUIRED_VERSION@)
|
||||
|
||||
@PACKAGE_SETUP_AUTOMOC_VARIABLES@
|
||||
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ macro(add_conf_unittest _source)
|
|||
Qt6::Test
|
||||
Qt6::Widgets
|
||||
Qt6::Xml
|
||||
KF5::I18n
|
||||
KF5::Completion
|
||||
KF5::WidgetsAddons
|
||||
KF6::I18n
|
||||
KF6::Completion
|
||||
KF6::WidgetsAddons
|
||||
)
|
||||
endmacro ()
|
||||
|
||||
|
|
@ -61,12 +61,12 @@ endif()
|
|||
|
||||
ecm_add_test(suggestedfilenametest.cpp
|
||||
TEST_NAME "suggestedfilenametest"
|
||||
LINK_LIBRARIES Qt6::Test okularcore KF5::I18n
|
||||
LINK_LIBRARIES Qt6::Test okularcore KF6::I18n
|
||||
)
|
||||
|
||||
ecm_add_test(documenttest.cpp
|
||||
TEST_NAME "documenttest"
|
||||
LINK_LIBRARIES Qt6::Widgets Qt6::Test Qt6::Xml okularcore KF5::ThreadWeaver
|
||||
LINK_LIBRARIES Qt6::Widgets Qt6::Test Qt6::Xml okularcore KF6::ThreadWeaver
|
||||
)
|
||||
|
||||
ecm_add_test(searchtest.cpp
|
||||
|
|
@ -81,7 +81,7 @@ ecm_add_test(annotationstest.cpp
|
|||
|
||||
ecm_add_test(urldetecttest.cpp
|
||||
TEST_NAME "urldetecttest"
|
||||
LINK_LIBRARIES Qt6::Widgets Qt6::Test Qt6::Xml KF5::CoreAddons
|
||||
LINK_LIBRARIES Qt6::Widgets Qt6::Test Qt6::Xml KF6::CoreAddons
|
||||
)
|
||||
|
||||
ecm_add_test(editannotationcontentstest.cpp testingutils.cpp
|
||||
|
|
@ -118,16 +118,15 @@ ecm_add_test(check_distinguished_name_parser.cpp
|
|||
TEST_NAME "distinguishednameparser"
|
||||
LINK_LIBRARIES Qt6::Test)
|
||||
|
||||
if(KF5Activities_FOUND AND BUILD_DESKTOP)
|
||||
ecm_add_test(mainshelltest.cpp ../shell/okular_main.cpp ../shell/shellutils.cpp ../shell/shell.cpp ../shell/welcomescreen.cpp ../shell/recentitemsmodel.cpp closedialoghelper.cpp
|
||||
TEST_NAME "mainshelltest"
|
||||
LINK_LIBRARIES Qt6::Test KF5::Activities okularpart okularcore
|
||||
)
|
||||
target_compile_definitions(mainshelltest PRIVATE OKULAR_BINARY="$<TARGET_FILE:okular>")
|
||||
if(KF6Activities_FOUND AND BUILD_DESKTOP)
|
||||
ecm_add_test(mainshelltest.cpp ../shell/okular_main.cpp ../shell/shellutils.cpp ../shell/shell.cpp ../shell/welcomescreen.cpp ../shell/recentitemsmodel.cpp closedialoghelper.cpp
|
||||
TEST_NAME "mainshelltest"
|
||||
LINK_LIBRARIES Qt6::Test KF6::Activities okularpart okularcore
|
||||
)
|
||||
target_compile_definitions(mainshelltest PRIVATE OKULAR_BINARY="$<TARGET_FILE:okular>")
|
||||
|
||||
if (HAVE_X11)
|
||||
target_link_libraries(mainshelltest Qt6::GuiPrivate)
|
||||
endif()
|
||||
if (HAVE_X11)
|
||||
target_link_libraries(mainshelltest Qt6::GuiPrivate)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
@ -144,7 +143,7 @@ endif()
|
|||
|
||||
ecm_add_test(generatorstest.cpp
|
||||
TEST_NAME "generatorstest"
|
||||
LINK_LIBRARIES Qt6::Test KF5::CoreAddons okularcore
|
||||
LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore
|
||||
)
|
||||
target_compile_definitions(generatorstest PRIVATE GENERATORS_BUILD_DIR="${CMAKE_BINARY_DIR}/generators")
|
||||
|
||||
|
|
@ -158,11 +157,11 @@ find_package(Discount)
|
|||
if(Discount_FOUND)
|
||||
ecm_add_test(markdowntest.cpp ../generators/markdown/converter.cpp
|
||||
TEST_NAME "markdowntest"
|
||||
LINK_LIBRARIES Qt6::Test okularcore KF5::I18n PkgConfig::Discount
|
||||
LINK_LIBRARIES Qt6::Test okularcore KF6::I18n PkgConfig::Discount
|
||||
)
|
||||
endif()
|
||||
|
||||
ecm_add_test(toggleactionmenutest.cpp ../part/toggleactionmenu.cpp
|
||||
TEST_NAME "toggleactionmenutest"
|
||||
LINK_LIBRARIES Qt6::Test KF5::WidgetsAddons
|
||||
LINK_LIBRARIES Qt6::Test KF6::WidgetsAddons
|
||||
)
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ endif(LIBSPECTRE_FOUND)
|
|||
|
||||
add_subdirectory( kimgio )
|
||||
|
||||
if(CHM_FOUND AND KF5KHtml_FOUND AND LIBZIP_FOUND)
|
||||
if(FALSE)
|
||||
add_subdirectory( chm )
|
||||
endif()
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ endif(EPUB_FOUND)
|
|||
|
||||
add_subdirectory(txt)
|
||||
|
||||
if(QMobipocket_FOUND)
|
||||
if(QMobipocket6_FOUND)
|
||||
add_subdirectory(mobipocket)
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@ set(okularGenerator_chmlib_SRCS
|
|||
|
||||
okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
|
||||
target_include_directories(okularGenerator_chmlib PRIVATE ${CHM_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR})
|
||||
target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml)
|
||||
target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF6::KHtml)
|
||||
|
||||
########### autotests ###############
|
||||
|
||||
add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
|
||||
ecm_add_test(autotests/chmgeneratortest.cpp
|
||||
TEST_NAME "chmgeneratortest"
|
||||
LINK_LIBRARIES Qt6::Test KF5::CoreAddons okularcore
|
||||
LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore
|
||||
)
|
||||
|
||||
target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@ include_directories(
|
|||
set(kio_msits_PART_SRCS msits.cpp kio_mits_debug.cpp)
|
||||
|
||||
kcoreaddons_add_plugin(kio_msits SOURCES ${kio_msits_PART_SRCS} INSTALL_NAMESPACE "kf5/kio")
|
||||
target_link_libraries(kio_msits KF5::KIOCore Qt6::Core ${CHM_LIBRARY} Qt6::Network)
|
||||
target_link_libraries(kio_msits KF6::KIOCore Qt6::Core ${CHM_LIBRARY} Qt6::Network)
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@ set( okularGenerator_comicbook_PART_SRCS
|
|||
)
|
||||
|
||||
add_library(okular_comicbook STATIC ${okularGenerator_comicbook_PART_SRCS})
|
||||
target_link_libraries(okular_comicbook okularcore KF5::I18n KF5::Archive)
|
||||
target_link_libraries(okular_comicbook okularcore KF6::I18n KF6::Archive)
|
||||
|
||||
okular_add_generator(okularGenerator_comicbook generator_comicbook.cpp)
|
||||
target_link_libraries(okularGenerator_comicbook okular_comicbook)
|
||||
if (UNIX AND NOT ANDROID)
|
||||
find_package(KF5Pty REQUIRED)
|
||||
find_package(KF6Pty REQUIRED)
|
||||
target_compile_definitions(okular_comicbook PRIVATE -DWITH_KPTY=1)
|
||||
target_link_libraries(okular_comicbook KF5::Pty)
|
||||
target_link_libraries(okular_comicbook KF6::Pty)
|
||||
endif ()
|
||||
|
||||
if (KArchive_HAVE_LZMA)
|
||||
|
|
@ -30,7 +30,7 @@ endif()
|
|||
add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
|
||||
ecm_add_test(autotests/comicbooktest.cpp
|
||||
TEST_NAME "comicbooktest"
|
||||
LINK_LIBRARIES Qt6::Test KF5::CoreAddons okularcore okular_comicbook
|
||||
LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore okular_comicbook
|
||||
)
|
||||
|
||||
########### install files ###############
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ set(okularGenerator_djvu_SRCS
|
|||
okular_add_generator(okularGenerator_djvu ${okularGenerator_djvu_SRCS})
|
||||
|
||||
target_include_directories(okularGenerator_djvu PRIVATE ${DJVULIBRE_INCLUDE_DIR})
|
||||
target_link_libraries(okularGenerator_djvu okularcore ${DJVULIBRE_LIBRARY} KF5::I18n)
|
||||
target_link_libraries(okularGenerator_djvu okularcore ${DJVULIBRE_LIBRARY} KF6::I18n)
|
||||
|
||||
########### install files ###############
|
||||
install( PROGRAMS okularApplication_djvu.desktop org.kde.mobile.okular_djvu.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ set(okularGenerator_dvi_SRCS
|
|||
|
||||
okular_add_generator(okularGenerator_dvi ${okularGenerator_dvi_SRCS})
|
||||
|
||||
target_link_libraries(okularGenerator_dvi okularcore KF5::I18n)
|
||||
target_link_libraries(okularGenerator_dvi okularcore KF6::I18n)
|
||||
if (FREETYPE_FOUND)
|
||||
target_link_libraries(okularGenerator_dvi Freetype::Freetype)
|
||||
endif (FREETYPE_FOUND)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ set(okularGenerator_epub_PART_SRCS
|
|||
okular_add_generator(okularGenerator_epub ${okularGenerator_epub_PART_SRCS})
|
||||
|
||||
target_include_directories(okularGenerator_epub PRIVATE ${EPUB_INCLUDE_DIR})
|
||||
target_link_libraries(okularGenerator_epub okularcore ${EPUB_LIBRARIES} KF5::I18n Qt6::Widgets Qt6::Xml)
|
||||
target_link_libraries(okularGenerator_epub okularcore ${EPUB_LIBRARIES} KF6::I18n Qt6::Widgets Qt6::Xml)
|
||||
|
||||
|
||||
########### autotests ###############
|
||||
|
|
@ -22,7 +22,7 @@ target_link_libraries(okularGenerator_epub okularcore ${EPUB_LIBRARIES} KF5::I18
|
|||
add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
|
||||
ecm_add_test(autotests/epubgeneratortest.cpp
|
||||
TEST_NAME "epubgeneratortest"
|
||||
LINK_LIBRARIES Qt6::Test KF5::CoreAddons okularcore
|
||||
LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ set(okularGenerator_fax_PART_SRCS generator_fax.cpp faxdocument.cpp faxexpand.cp
|
|||
|
||||
okular_add_generator(okularGenerator_fax ${okularGenerator_fax_PART_SRCS})
|
||||
|
||||
target_link_libraries(okularGenerator_fax okularcore KF5::I18n Qt6::Xml)
|
||||
target_link_libraries(okularGenerator_fax okularcore KF6::I18n Qt6::Xml)
|
||||
|
||||
########### install files ###############
|
||||
install( PROGRAMS okularApplication_fax.desktop org.kde.mobile.okular_fax.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ set(okularGenerator_fb_PART_SRCS
|
|||
|
||||
okular_add_generator(okularGenerator_fb ${okularGenerator_fb_PART_SRCS})
|
||||
|
||||
target_link_libraries(okularGenerator_fb okularcore KF5::Archive KF5::I18n Qt6::Xml)
|
||||
target_link_libraries(okularGenerator_fb okularcore KF6::Archive KF6::I18n Qt6::Xml)
|
||||
|
||||
########### install files ###############
|
||||
install( PROGRAMS okularApplication_fb.desktop org.kde.mobile.okular_fb.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@ add_definitions(-DTRANSLATION_DOMAIN="okular_kimgio")
|
|||
########### next target ###############
|
||||
|
||||
okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp)
|
||||
target_link_libraries(okularGenerator_kimgio okularcore KF5::I18n)
|
||||
target_link_libraries(okularGenerator_kimgio okularcore KF6::I18n)
|
||||
|
||||
if(KF5KExiv2_FOUND)
|
||||
if(KF6KExiv2_FOUND)
|
||||
target_compile_definitions(okularGenerator_kimgio PRIVATE -DWITH_KEXIV=1)
|
||||
target_link_libraries(okularGenerator_kimgio KF5::KExiv2)
|
||||
target_link_libraries(okularGenerator_kimgio KF6::KExiv2)
|
||||
endif()
|
||||
|
||||
if(BUILD_TESTING AND BUILD_DESKTOP AND KF5KExiv2_FOUND)
|
||||
if(BUILD_TESTING AND BUILD_DESKTOP AND KF6KExiv2_FOUND)
|
||||
add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
|
||||
set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/gui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/gui/guiutils.cpp ${CMAKE_SOURCE_DIR}/gui/debug_ui.cpp )
|
||||
ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt6::Svg Qt6::Test)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ set(okularGenerator_md_PART_SRCS
|
|||
|
||||
okular_add_generator(okularGenerator_md ${okularGenerator_md_PART_SRCS})
|
||||
|
||||
target_link_libraries(okularGenerator_md PRIVATE okularcore KF5::I18n PkgConfig::Discount)
|
||||
target_link_libraries(okularGenerator_md PRIVATE okularcore KF6::I18n PkgConfig::Discount)
|
||||
|
||||
########### install files ###############
|
||||
install( PROGRAMS okularApplication_md.desktop org.kde.mobile.okular_md.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ set(okularGenerator_mobi_PART_SRCS
|
|||
|
||||
okular_add_generator(okularGenerator_mobi ${okularGenerator_mobi_PART_SRCS})
|
||||
|
||||
target_link_libraries(okularGenerator_mobi okularcore qmobipocket KF5::I18n Qt6::Gui)
|
||||
target_link_libraries(okularGenerator_mobi okularcore QMobipocket6 KF6::I18n Qt6::Gui)
|
||||
|
||||
########### install files ###############
|
||||
install( PROGRAMS okularApplication_mobi.desktop org.kde.mobile.okular_mobi.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ set(okularGenerator_plucker_SRCS
|
|||
okular_add_generator(okularGenerator_plucker ${okularGenerator_plucker_SRCS} ${qunpluck_SRCS})
|
||||
|
||||
target_include_directories(okularGenerator_plucker PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/unpluck)
|
||||
target_link_libraries(okularGenerator_plucker okularcore KF5::I18n ${MATH_LIB} JPEG::JPEG ZLIB::ZLIB)
|
||||
target_link_libraries(okularGenerator_plucker okularcore KF6::I18n ${MATH_LIB} JPEG::JPEG ZLIB::ZLIB)
|
||||
|
||||
########### install files ###############
|
||||
install( PROGRAMS okularApplication_plucker.desktop org.kde.mobile.okular_plucker.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ kconfig_add_kcfg_files(okularGenerator_poppler_PART_SRCS GENERATE_MOC conf/pdfse
|
|||
|
||||
okular_add_generator(okularGenerator_poppler ${okularGenerator_poppler_PART_SRCS})
|
||||
|
||||
target_link_libraries(okularGenerator_poppler okularcore KF5::I18n KF5::Completion KF5::KIOWidgets Poppler::Qt6 Qt6::Xml)
|
||||
target_link_libraries(okularGenerator_poppler okularcore KF6::I18n KF6::Completion KF6::KIOWidgets Poppler::Qt6 Qt6::Xml)
|
||||
|
||||
########### autotests ###############
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ kconfig_add_kcfg_files(okularGenerator_ghostview_SRCS conf/gssettings.kcfgc )
|
|||
okular_add_generator(okularGenerator_ghostview ${okularGenerator_ghostview_SRCS})
|
||||
|
||||
target_include_directories(okularGenerator_ghostview PRIVATE ${LIBSPECTRE_INCLUDE_DIR})
|
||||
target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} KF5::I18n Qt6::Xml)
|
||||
target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} KF6::I18n Qt6::Xml)
|
||||
|
||||
########### install files ###############
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ set(okularGenerator_tiff_SRCS
|
|||
)
|
||||
|
||||
okular_add_generator(okularGenerator_tiff ${okularGenerator_tiff_SRCS})
|
||||
target_link_libraries(okularGenerator_tiff okularcore TIFF::TIFF KF5::I18n)
|
||||
target_link_libraries(okularGenerator_tiff okularcore TIFF::TIFF KF6::I18n)
|
||||
|
||||
########### install files ###############
|
||||
install( PROGRAMS okularApplication_tiff.desktop org.kde.mobile.okular_tiff.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ set(okularGenerator_txt_SRCS
|
|||
|
||||
okular_add_generator(okularGenerator_txt ${okularGenerator_txt_SRCS})
|
||||
|
||||
target_link_libraries(okularGenerator_txt okularcore Qt6::Core KF5::I18n)
|
||||
target_link_libraries(okularGenerator_txt okularcore Qt6::Core KF6::I18n)
|
||||
|
||||
########### install files ###############
|
||||
install( PROGRAMS okularApplication_txt.desktop org.kde.mobile.okular_txt.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ set(okularGenerator_xps_SRCS
|
|||
|
||||
okular_add_generator(okularGenerator_xps ${okularGenerator_xps_SRCS})
|
||||
|
||||
target_link_libraries(okularGenerator_xps okularcore KF5::Archive KF5::I18n Qt6::PrintSupport Qt6::Xml)
|
||||
target_link_libraries(okularGenerator_xps okularcore KF6::Archive KF6::I18n Qt6::PrintSupport Qt6::Xml)
|
||||
|
||||
########### install files ###############
|
||||
install( PROGRAMS okularApplication_xps.desktop org.kde.mobile.okular_xps.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ include_directories(
|
|||
${CMAKE_CURRENT_BINARY_DIR}/../../
|
||||
)
|
||||
add_executable(okularkirigami main.cpp app.qrc)
|
||||
target_link_libraries(okularkirigami Qt6::Widgets Qt6::Qml KF5::I18n KF5::CoreAddons)
|
||||
target_link_libraries(okularkirigami Qt6::Widgets Qt6::Qml KF6::I18n KF6::CoreAddons)
|
||||
if (ANDROID)
|
||||
target_sources(okularkirigami PRIVATE android.cpp)
|
||||
|
||||
|
|
|
|||
|
|
@ -23,9 +23,9 @@ target_link_libraries(okularplugin
|
|||
Qt6::Core
|
||||
Qt6::Xml
|
||||
Qt6::Svg
|
||||
KF5::Bookmarks
|
||||
KF5::I18n
|
||||
KF5::Service
|
||||
KF6::Bookmarks
|
||||
KF6::I18n
|
||||
KF6::Service
|
||||
okularcore
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@ ecm_add_app_icon(okular_SRCS ICONS ${ICONS_SRCS})
|
|||
|
||||
add_executable(okular ${okular_SRCS})
|
||||
|
||||
target_link_libraries(okular KF5::I18n KF5::Parts KF5::WindowSystem KF5::Crash KF5::IconThemes)
|
||||
target_link_libraries(okular KF6::I18n KF6::Parts KF6::WindowSystem KF6::Crash KF6::IconThemes)
|
||||
if (TARGET Qt6::DBus)
|
||||
target_link_libraries(okular Qt6::DBus)
|
||||
endif()
|
||||
if(TARGET KF5::Activities)
|
||||
if(TARGET KF6::Activities)
|
||||
target_compile_definitions(okular PUBLIC -DWITH_KACTIVITIES=1)
|
||||
|
||||
target_link_libraries(okular KF5::Activities)
|
||||
target_link_libraries(okular KF6::Activities)
|
||||
endif()
|
||||
|
||||
if (HAVE_X11)
|
||||
|
|
|
|||
Loading…
Reference in a new issue