diff --git a/CMakeLists.txt b/CMakeLists.txt index 4942c7d..896fb53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,97 +1,90 @@ cmake_minimum_required(VERSION 3.5) set(PIM_VERSION "5.12.40") project(pimcommon VERSION ${PIM_VERSION}) -set(KF5_MIN_VERSION "5.61.0") +set(KF5_MIN_VERSION "5.62.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(LIBRARY_NAMELINK) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMGeneratePriFile) include(ECMSetupVersion) include(FeatureSummary) include(ECMQtDeclareLoggingCategory) include(ECMAddTests) include(ECMInstallIcons) set(PIMCOMMON_LIB_VERSION ${PIM_VERSION}) set(AKONADICONTACT_LIB_VERSION "5.12.40") set(LIBKDEPIM_LIB_VERSION "5.12.40") set(QT_REQUIRED_VERSION "5.11.0") set(KMIME_LIB_VERSION "5.12.40") set(KIMAP_LIB_VERSION "5.12.40") set(KCONTACTS_LIB_VERSION "5.12.40") set(KPIMTEXTEDIT_LIB_VERSION "5.12.40") set(AKONADI_VERSION "5.12.40") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Network Test Xml PrintSupport) find_package(KF5Archive ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5ItemModels ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5JobWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5NewStuff ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Service ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED) find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED) find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED) find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Purpose ${KF5_MIN_VERSION} CONFIG REQUIRED) -set(USE_NEW_DESIGNERPLUGIN_MACRO false) -if (ECM_VERSION VERSION_GREATER "5.61.0") - option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON) - add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer") - set(USE_NEW_DESIGNERPLUGIN_MACRO true) -else() - find_package(KF5DesignerPlugin ${KF5_MIN_VERSION} CONFIG) - set_package_properties(KF5DesignerPlugin PROPERTIES DESCRIPTION "KF5 designer plugin" TYPE OPTIONAL) -endif() +option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON) +add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer") find_package(Xsltproc) set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.") if(BUILD_TESTING) find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) add_definitions(-DBUILD_TESTING) endif(BUILD_TESTING) ########### Targets ########### if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) endif() add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) install(FILES pimcommon.renamecategories pimcommon.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/pimcommon/designer/CMakeLists.txt b/src/pimcommon/designer/CMakeLists.txt index bcd40fa..109bd5e 100644 --- a/src/pimcommon/designer/CMakeLists.txt +++ b/src/pimcommon/designer/CMakeLists.txt @@ -1,49 +1,25 @@ -if (USE_NEW_DESIGNERPLUGIN_MACRO) - include(ECMAddQtDesignerPlugin) - ecm_qtdesignerplugin_widget(PimCommon::SimpleStringListEditor - INCLUDE_FILE "pimcommon/simplestringlisteditor.h" - TOOLTIP "A listbox with add/remove/move up/down button (KDE-PIM)" - WHATSTHIS "A listbox which lets organize list order." - GROUP "Input (KDE-PIM)" - ) - ecm_qtdesignerplugin_widget(PimCommon::TranslatorWidget - INCLUDE_FILE "pimcommon/translatorwidget.h" - TOOLTIP "A widget to make translate string (KDE-PIM)" - WHATSTHIS "A widget to make translate string." - GROUP "Input (KDE-PIM)" - ) +include(ECMAddQtDesignerPlugin) +ecm_qtdesignerplugin_widget(PimCommon::SimpleStringListEditor + INCLUDE_FILE "pimcommon/simplestringlisteditor.h" + TOOLTIP "A listbox with add/remove/move up/down button (KDE-PIM)" + WHATSTHIS "A listbox which lets organize list order." + GROUP "Input (KDE-PIM)" + ) +ecm_qtdesignerplugin_widget(PimCommon::TranslatorWidget + INCLUDE_FILE "pimcommon/translatorwidget.h" + TOOLTIP "A widget to make translate string (KDE-PIM)" + WHATSTHIS "A widget to make translate string." + GROUP "Input (KDE-PIM)" + ) - ecm_add_qtdesignerplugin(pimcommonwidgets - NAME PimCommonWidgets - OUTPUT_NAME pimcommonwidgets - WIDGETS - PimCommon::SimpleStringListEditor - PimCommon::TranslatorWidget - LINK_LIBRARIES - KF5::PimCommon KF5::PimTextEdit - INSTALL_DESTINATION "${KDE_INSTALL_QTPLUGINDIR}/designer" - COMPONENT Devel - ) -else() - - if (KF5DesignerPlugin_FOUND) - kf5designerplugin_add_plugin(pimcommonwidgets pimcommon.widgets) - target_link_libraries(pimcommonwidgets - KF5::PimCommon KF5::PimTextEdit - ) - if(NOT WIN32) - # Since there are no libraries provided by this module, - # there is no point including the build tree in RPath, - # and then having to edit it at install time. - set_target_properties(pimcommonwidgets PROPERTIES - SKIP_BUILD_RPATH TRUE - BUILD_WITH_INSTALL_RPATH TRUE - ) - endif() - - install(TARGETS - pimcommonwidgets - DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer - ) - endif() -endif() +ecm_add_qtdesignerplugin(pimcommonwidgets + NAME PimCommonWidgets + OUTPUT_NAME pimcommonwidgets + WIDGETS + PimCommon::SimpleStringListEditor + PimCommon::TranslatorWidget + LINK_LIBRARIES + KF5::PimCommon KF5::PimTextEdit + INSTALL_DESTINATION "${KDE_INSTALL_QTPLUGINDIR}/designer" + COMPONENT Devel + ) diff --git a/src/pimcommon/designer/pimcommon.widgets b/src/pimcommon/designer/pimcommon.widgets deleted file mode 100644 index d3a8436..0000000 --- a/src/pimcommon/designer/pimcommon.widgets +++ /dev/null @@ -1,15 +0,0 @@ -[Global] -PluginName=PimCommonWidgets - -[PimCommon::SimpleStringListEditor] -ToolTip=A listbox with add/remove/move up/down button (KDE-PIM) -WhatsThis=A listbox which lets organize list order. -IncludeFile=pimcommon/simplestringlisteditor.h -Group=Input (KDE-PIM) - -[PimCommon::TranslatorWidget] -ToolTip=A widget to make translate string (KDE-PIM) -WhatsThis=A widget to make translate string -IncludeFile=pimcommon/translatorwidget.h -Group=Input (KDE-PIM) -