diff --git a/CMakeLists.txt b/CMakeLists.txt index 4199f8a..e9a6b58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,104 +1,101 @@ cmake_minimum_required(VERSION 3.5) set(KF5_VERSION "5.68.0") # handled by release scripts set(KF5_DEP_VERSION "5.67.0") # handled by release scripts project(KBookmarks VERSION ${KF5_VERSION}) include(FeatureSummary) find_package(ECM 5.67.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMQtDeclareLoggingCategory) include(ECMGenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMAddQch) include(ECMPoQmTools) set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") ecm_setup_version(PROJECT VARIABLE_PREFIX KBOOKMARKS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kbookmarks_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5BookmarksConfigVersion.cmake" SOVERSION 5) # Dependencies set(REQUIRED_QT_VERSION 5.12.0) find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets Xml) if (NOT ANDROID) find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED DBus) endif() find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Codecs ${KF5_DEP_VERSION} REQUIRED) find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED) find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5XmlGui ${KF5_DEP_VERSION} REQUIRED) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ecm_install_po_files_as_qm(po) endif() add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054300) add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(tests) add_subdirectory(autotests) endif() # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Bookmarks") if (BUILD_QCH) ecm_install_qch_export( TARGETS KF5Bookmarks_QCH FILE KF5BookmarksQchTargets.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5BookmarksQchTargets.cmake\")") endif() include(CMakePackageConfigHelpers) configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5BookmarksConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5BookmarksConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5BookmarksConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KF5BookmarksConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) install(EXPORT KF5BookmarksTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5BookmarksTargets.cmake NAMESPACE KF5:: ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kbookmarks_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -# contains list of debug categories, for kdebugsettings -install(FILES kbookmarks.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/kbookmarks.categories b/kbookmarks.categories deleted file mode 100644 index 5919431..0000000 --- a/kbookmarks.categories +++ /dev/null @@ -1 +0,0 @@ -kf5.kbookmarks kbookmarks IDENTIFIER [KBOOKMARKS_LOG] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cbd933e..679aa2a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,122 +1,134 @@ ecm_create_qm_loader(kbookmarks_QM_LOADER kbookmarks5_qt) set(kbookmarks_SRCS kbookmark.cpp kbookmarkaction.cpp kbookmarkactioninterface.cpp kbookmarkactionmenu.cpp kbookmarkcontextmenu.cpp kbookmarkimporter.cpp kbookmarkmanager.cpp kbookmarkmenu.cpp kbookmarkowner.cpp konqbookmarkmenu.cpp kbookmarkimporter_opera.cpp kbookmarkimporter_ie.cpp kbookmarkimporter_ns.cpp kbookmarkdombuilder.cpp kbookmarkdialog.cpp ${kbookmarks_QM_LOADER} ) if (TARGET Qt5::DBus) list(APPEND kbookmarks_SRCS kbookmarkmanageradaptor.cpp) endif() -ecm_qt_declare_logging_category(kbookmarks_SRCS HEADER kbookmarks_debug.h IDENTIFIER KBOOKMARKS_LOG CATEGORY_NAME kf5.kbookmarks) +ecm_qt_declare_logging_category(kbookmarks_SRCS + HEADER kbookmarks_debug.h + IDENTIFIER KBOOKMARKS_LOG + CATEGORY_NAME kf5.kbookmarks + DESCRIPTION "KBookmarks" + EXPORT KBOOKMARKS +) add_library(KF5Bookmarks ${kbookmarks_SRCS}) add_library(KF5::Bookmarks ALIAS KF5Bookmarks) ecm_generate_export_header(KF5Bookmarks BASE_NAME KBookmarks GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 DEPRECATION_VERSIONS 5.0 5.65 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) target_include_directories(KF5Bookmarks INTERFACE "$") target_link_libraries(KF5Bookmarks PUBLIC Qt5::Widgets Qt5::Xml KF5::WidgetsAddons) target_link_libraries(KF5Bookmarks PRIVATE KF5::CoreAddons # for KStringHandler KF5::Codecs # for KCharsets KF5::ConfigCore # for KConfigGroup KF5::ConfigWidgets # for KStandardAction KF5::XmlGui # for KActionCollection ) if (TARGET Qt5::DBus) target_link_libraries(KF5Bookmarks PRIVATE Qt5::DBus) # dbus usage in kbookmarkmanager.cpp else() target_compile_definitions(KF5Bookmarks PUBLIC -DKBOOKMARKS_NO_DBUS) endif() set_target_properties(KF5Bookmarks PROPERTIES VERSION ${KBOOKMARKS_VERSION_STRING} SOVERSION ${KBOOKMARKS_SOVERSION} EXPORT_NAME Bookmarks ) ecm_generate_headers(KBookmarks_HEADERS HEADER_NAMES KBookmark KBookmarkAction KBookmarkActionInterface KBookmarkActionMenu KBookmarkContextMenu KBookmarkManager KBookmarkMenu KBookmarkOwner KBookmarkDomBuilder KBookmarkDialog KonqBookmarkMenu REQUIRED_HEADERS KBookmarks_HEADERS ) # These classes have weirdly named classes, no forwarding headers. set(KBookmarks_HEADERS ${KBookmarks_HEADERS} kbookmarkexporter.h kbookmarkimporter.h kbookmarkimporter_opera.h kbookmarkimporter_ie.h kbookmarkimporter_ns.h ) install(TARGETS KF5Bookmarks EXPORT KF5BookmarksTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kbookmarks_export.h ${KBookmarks_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KBookmarks COMPONENT Devel ) +ecm_qt_install_logging_categories( + EXPORT KBOOKMARKS + FILE kbookmarks.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} +) + if(BUILD_QCH) ecm_add_qch( KF5Bookmarks_QCH NAME KBookmarks BASE_NAME KF5Bookmarks VERSION ${KF5_VERSION} ORG_DOMAIN org.kde SOURCES # using only public headers, to cover only public API ${KBookmarks_HEADERS} MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" LINK_QCHS Qt5Widgets_QCH Qt5Xml_QCH KF5WidgetsAddons_QCH INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} BLANK_MACROS KBOOKMARKS_EXPORT KBOOKMARKS_DEPRECATED KBOOKMARKS_DEPRECATED_EXPORT "KBOOKMARKS_DEPRECATED_VERSION(x, y, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel ) endif() include(ECMGeneratePriFile) ecm_generate_pri_file(BASE_NAME KBookmarks LIB_NAME KF5Bookmarks DEPS "widgets xml" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KBookmarks) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})