diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a2c73c..39d5909 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,52 +1,46 @@ project(peruse) cmake_minimum_required(VERSION 2.8.12) if(POLICY CMP0063) cmake_policy (SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 0.0.9 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${ECM_MODULE_PATH}) # Android has no DBus, so we can't use that. Sniff things and tell the code if(CMAKE_SYSTEM_NAME STREQUAL Android) message("Building for Android - this means no dbus, and other small details. Work with that") add_definitions(-DANDROID) SET(QT_QMAKE_EXECUTABLE "$ENV{Qt5_android}/bin/qmake") elseif(WIN32) message("Building for Windows - this means no dbus, and other small details. Work with that") add_definitions(-DWINDOWS) endif() find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Qml Quick Gui Widgets OpenGL Sql) -find_package(KF5 5.5 REQUIRED COMPONENTS I18n Declarative Config FileMetaData IconThemes KIO) +find_package(KF5 5.56 REQUIRED COMPONENTS I18n Declarative Config FileMetaData IconThemes KIO NewStuffQuick) find_package(KF5Baloo) # optional - we'll just let it pass if it's missing find_package(KF5Archive ${KF5_VERSION} REQUIRED) -find_package(KF5NewStuffQuick) # optional - this currently sits in a branch. Make required when branch is merged into master -set_package_properties(KF5NewStuffQuick PROPERTIES - PURPOSE "Required at runtime to use the store functionality" - TYPE RUNTIME -) - -find_package(KF5Kirigami2 5.37.0) +find_package(KF5Kirigami2 5.56.0) set_package_properties(KF5Kirigami2 PROPERTIES PURPOSE "Required at runtime to display the GUI" TYPE RUNTIME ) include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) include(GenerateExportHeader) include(ECMInstallIcons) include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) kde_enable_exceptions() add_subdirectory(src) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/qtquick/CMakeLists.txt b/src/qtquick/CMakeLists.txt index 8a54965..70e6099 100644 --- a/src/qtquick/CMakeLists.txt +++ b/src/qtquick/CMakeLists.txt @@ -1,67 +1,67 @@ add_subdirectory(karchive-rar) set(USE_PERUSE_PDFTHUMBNAILER false) if(WIN32) set(USE_PERUSE_PDFTHUMBNAILER true) endif() set(qmlplugin_SRCS qmlplugin.cpp ArchiveBookModel.cpp ArchiveImageProvider.cpp BookDatabase.cpp BookModel.cpp BookListModel.cpp CategoryEntriesModel.cpp ComicCoverImageProvider.cpp FilterProxy.cpp FolderBookModel.cpp PeruseConfig.cpp PreviewImageProvider.cpp PropertyContainer.cpp ) if(USE_PERUSE_PDFTHUMBNAILER) set(qmlplugin_SRCS ${qmlplugin_SRCS} PDFCoverImageProvider.cpp ) endif() ecm_qt_declare_logging_category(qmlplugin_SRCS HEADER qtquick_debug.h IDENTIFIER QTQUICK_LOG CATEGORY_NAME org.kde.peruse.qml DEFAULT_SEVERITY Warning ) add_library (peruseqmlplugin SHARED ${qmlplugin_SRCS}) if(USE_PERUSE_PDFTHUMBNAILER) target_compile_definitions(peruseqmlplugin PRIVATE -DUSE_PERUSE_PDFTHUMBNAILER ) endif() target_include_directories(peruseqmlplugin PRIVATE karchive-rar acbf ) target_link_libraries (peruseqmlplugin acbf karchive-rar Qt5::Core Qt5::Qml Qt5::Quick Qt5::Sql KF5::Archive KF5::IconThemes KF5::ConfigCore KF5::KIOCore KF5::KIOWidgets KF5::FileMetaData ) install (TARGETS peruseqmlplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/peruse) install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/peruse) -install (FILES peruse.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) +install (FILES peruse.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})