Commit ba8002c0 authored by Laurent Montel's avatar Laurent Montel 😁

Improve build as standalone

parent dc402bb5
......@@ -23,7 +23,7 @@
#include "attachmenthandler.h"
#include "utils.h"
#include "libkdepimdbusinterfaces/urihandler.h"
#include "libkdepimdbusinterfaces/src/urihandler.h"
#include "incidenceattachmentmodel.h"
#include <CollectionFetchJob>
......
......@@ -39,7 +39,7 @@ find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5WebKit ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
#find_package(KF5PimCommon ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimCommon ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX COMPOSEREDITORNG
......
......@@ -25,13 +25,19 @@ set(KF5_VERSION "5.14.0")
set(KDEPIMLIBS_LIB_VERSION "5.0.42")
set(KDEPIM_LIB_VERSION "5.43.0")
set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools)
find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
#KF5::CalendarSupport
#KF5::CalendarCore
#KF5::CalendarUtils
#KF5::AkonadiCalendar
#KF5::KDGantt2
ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX EVENTVIEWS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/eventviews_version.h"
......
......@@ -33,6 +33,21 @@ find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarSupport ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5EventViews ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
# KF5::AkonadiCalendar
# KF5::CalendarCore
# KF5::CalendarUtils
# KF5::MailTransport
# KF5::KDGantt2 # For FreeBusy Editor
# kdepimdbusinterfaces # For UriHandler
# KF5::Ldap
# KF5::AkonadiWidgets
ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX INCIDENCEEDITORSNG
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/incidenceeditorsng_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5IncidenceEditorsngConfigVersion.cmake"
......
......@@ -23,7 +23,7 @@
#include "attachmenticonview.h"
#include "ui_dialogdesktop.h"
#include <libkdepimdbusinterfaces/urihandler.h>
#include <libkdepimdbusinterfaces/src/urihandler.h>
#include <KContacts/VCardDrag>
......
......@@ -35,6 +35,7 @@ find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED)
find_package(Grantlee5 "5.0" CONFIG REQUIRED)
find_package(KF5Libkleo ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5GrantleeTheme ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX KADDRESSBOOKGRANTLEE
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kaddressbookgrantlee_version.h"
......
......@@ -39,7 +39,7 @@
#include <dialogs/deletecertificatesdialog.h>
#include <models/keycache.h>
#include <models/predicates.h>
#include <Libkleo/Predicates>
#include <Libkleo/Stl_Util>
#include <Libkleo/CryptoBackend>
......
......@@ -36,7 +36,7 @@
#include "importcertificatescommand_p.h"
#include <models/keylistsortfilterproxymodel.h>
#include <models/predicates.h>
#include <Libkleo/Predicates>
#include <utils/formatting.h>
......
......@@ -44,7 +44,7 @@
#include <Libkleo/Stl_Util>
#include <models/keycache.h>
#include <models/predicates.h>
#include <Libkleo/Predicates>
#include <utils/detail_p.h>
#include <utils/input.h>
......
......@@ -43,7 +43,7 @@
#include <view/searchbar.h>
#include <models/keycache.h>
#include <models/predicates.h>
#include <Libkleo/Predicates>
#include <models/keylistmodel.h>
#include <utils/archivedefinition.h>
......
......@@ -39,7 +39,7 @@
#include <dialogs/certificateselectiondialog.h>
#include <models/predicates.h>
#include <Libkleo/Predicates>
#include <utils/gui-helper.h>
#include <utils/formatting.h>
......
......@@ -34,7 +34,7 @@
#include "recipient.h"
#include <models/predicates.h>
#include <Libkleo/Predicates>
#include <models/keycache.h>
#include <utils/kleo_assert.h>
......
......@@ -34,7 +34,7 @@
#include "sender.h"
#include <models/predicates.h>
#include <Libkleo/Predicates>
#include <models/keycache.h>
#include <utils/kleo_assert.h>
......
......@@ -35,7 +35,7 @@
#include "keycache.h"
#include "keycache_p.h"
#include "predicates.h"
#include "Libkleo/Predicates"
#include "smimevalidationpreferences.h"
......
......@@ -33,7 +33,7 @@
#include <config-kleopatra.h>
#include "keylistmodel.h"
#include "predicates.h"
#include "Libkleo/Predicates"
#ifdef KLEO_MODEL_TEST
# include "modeltest.h"
......
......@@ -36,7 +36,7 @@
#include <models/keylistmodel.h>
#include <models/keylistsortfilterproxymodel.h>
#include <models/predicates.h>
#include <Libkleo/Predicates>
#include <utils/headerview.h>
......
......@@ -27,7 +27,7 @@
#include "prefs.h"
using namespace Kontact;
#include <libkdepimdbusinterfaces/reminderclient.h>
#include <libkdepimdbusinterfaces/src/reminderclient.h>
#include <KontactInterface/Plugin>
#include <KontactInterface/UniqueAppHandler>
......
......@@ -41,7 +41,7 @@
#include "prefs/koprefs.h"
#include "koviewmanager.h"
#include "kowindowlist.h"
#include "reminderclient.h"
#include "libkdepimdbusinterfaces/src/reminderclient.h"
#include "kocheckableproxymodel.h"
#include <KHolidays/HolidayRegion>
......
......@@ -28,7 +28,7 @@
#include "actionmanager.h"
#include "calendarview.h"
#include "korganizer.h"
#include "reminderclient.h"
#include "libkdepimdbusinterfaces/src/reminderclient.h"
#include "kdepim-version.h"
#include <KCalCore/CalFormat>
#include <KStartupInfo>
......
project(libkdepimdbusinterfaces)
add_subdirectory(src)
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
########### next target ###############
set(kdepimdbusinterfaces_LIB_SRCS
urihandler.cpp
reminderclient.cpp
kdepimdbusinterface_debug.cpp
)
ecm_qt_declare_logging_category(kdepimdbusinterfaces_LIB_SRCS HEADER kdepimdbusinterface_debug.h IDENTIFIER KDEPIMDBUSINTERFACE_LOG CATEGORY_NAME log_kdepimdbusinterface)
qt5_generate_dbus_interface(${CMAKE_SOURCE_DIR}/kmail/kmkernel.h org.kde.kmail.kmail.xml OPTIONS -a)
qt5_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_SOURCE_DIR}/korgac/org.kde.korganizer.KOrgac.xml)
qt5_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_SOURCE_DIR}/korganizer/data/org.kde.korganizer.Korganizer.xml)
qt5_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.kmail.xml)
add_library(kdepimdbusinterfaces ${kdepimdbusinterfaces_LIB_SRCS})
generate_export_header(kdepimdbusinterfaces BASE_NAME kdepimdbusinterfaces)
add_dependencies(kdepimdbusinterfaces kmail_xml)
target_link_libraries(kdepimdbusinterfaces
PUBLIC
KF5::AkonadiCore
PRIVATE
KF5::AkonadiContact
KF5::KIOWidgets
Qt5::DBus
)
set_target_properties(kdepimdbusinterfaces
PROPERTIES VERSION ${KDEPIM_LIB_VERSION}
SOVERSION ${KDEPIM_LIB_SOVERSION}
)
install(TARGETS kdepimdbusinterfaces ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
target_include_directories(kdepimdbusinterfaces PUBLIC "$<BUILD_INTERFACE:${libkdepimdbusinterfaces_SOURCE_DIR};${libkdepimdbusinterfaces_BINARY_DIR}>")
project(libkdepimdbusinterfaces)
add_definitions( -DQT_NO_CAST_FROM_ASCII )
add_definitions( -DQT_NO_CAST_TO_ASCII )
########### next target ###############
set(kdepimdbusinterfaces_LIB_SRCS
urihandler.cpp
reminderclient.cpp
kdepimdbusinterface_debug.cpp
)
ecm_qt_declare_logging_category(kdepimdbusinterfaces_LIB_SRCS HEADER kdepimdbusinterface_debug.h IDENTIFIER KDEPIMDBUSINTERFACE_LOG CATEGORY_NAME log_kdepimdbusinterface)
qt5_generate_dbus_interface(${CMAKE_SOURCE_DIR}/kmail/kmkernel.h org.kde.kmail.kmail.xml OPTIONS -a)
qt5_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_SOURCE_DIR}/korgac/org.kde.korganizer.KOrgac.xml)
qt5_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_SOURCE_DIR}/korganizer/data/org.kde.korganizer.Korganizer.xml)
qt5_add_dbus_interfaces( kdepimdbusinterfaces_LIB_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.kmail.xml)
add_library(kdepimdbusinterfaces ${kdepimdbusinterfaces_LIB_SRCS})
generate_export_header(kdepimdbusinterfaces BASE_NAME kdepimdbusinterfaces)
add_dependencies(kdepimdbusinterfaces kmail_xml)
target_link_libraries(kdepimdbusinterfaces
PUBLIC
KF5::AkonadiCore
PRIVATE
KF5::AkonadiContact
KF5::KIOWidgets
Qt5::DBus
)
set_target_properties(kdepimdbusinterfaces
PROPERTIES VERSION ${KDEPIM_LIB_VERSION}
SOVERSION ${KDEPIM_LIB_SOVERSION}
)
install(TARGETS kdepimdbusinterfaces ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
target_include_directories(kdepimdbusinterfaces PUBLIC "$<BUILD_INTERFACE:${libkdepimdbusinterfaces_SOURCE_DIR};${libkdepimdbusinterfaces_BINARY_DIR}>")
......@@ -25,6 +25,7 @@ set(KF5_VERSION "5.14.0")
set(KDEPIMLIBS_LIB_VERSION "5.0.42")
set(KDEPIM_LIB_VERSION "5.43.0")
set(QT_REQUIRED_VERSION "5.4.0")
set(GPGMEPP_LIB_VERSION "4.80.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools Xml)
find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
......@@ -35,7 +36,9 @@ find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5CoreAddons ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimCommon ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX LIBKLEO
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkleo_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5LibkleoConfigVersion.cmake"
......@@ -43,8 +46,10 @@ ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX LIBKLEO
)
########### Targets ###########
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
remove_definitions( -DQT_NO_CAST_FROM_BYTEARRAY )
remove_definitions( -DQT_NO_CAST_FROM_ASCII )
remove_definitions( -DQT_NO_CAST_TO_ASCII )
########### CMake Config Files ###########
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Libkleo")
......
......@@ -110,7 +110,7 @@ set(kleo_LIB_SRCS ${libkleo_core_SRCS} ${libkleo_ui_common_SRCS} ${libkleo_backe
set(kleo_LIB_LIBS PUBLIC KF5::QGpgme PRIVATE KF5::PimCommon KF5::ConfigCore KF5::CoreAddons)
if ( NOT KDEPIM_ONLY_KLEO )
set( kleo_LIB_SRCS ${kleo_LIB_SRCS} ${libkleo_backend_chiasmus_SRCS} ${libkleo_ui_SRCS})
set( kleo_LIB_LIBS ${kleo_LIB_LIBS} PRIVATE KF5::WidgetsAddons KF5::Completion KF5::I18n KF5::IconThemes KF5::WindowSystem)
set( kleo_LIB_LIBS ${kleo_LIB_LIBS} PRIVATE KF5::WidgetsAddons KF5::Completion KF5::I18n KF5::IconThemes KF5::WindowSystem KF5::TextWidgets)
if (WIN32)
set(kleo_LIB_LIBS ${kleo_LIB_LIBS} PUBLIC KF5::Gpgmepp)
else()
......@@ -130,7 +130,7 @@ endif()
set_target_properties(KF5Libkleo PROPERTIES
VERSION ${LIBKLEO_VERSION_STRING}
SOVERSION ${LIBKLEO_SOVERSION}
EXPORT_NAME MailImporter
EXPORT_NAME Libkleo
)
install(TARGETS
......@@ -180,6 +180,7 @@ ecm_generate_headers(libkeo_CamelCase_HEADERS
Job
OidMap
ListAllKeysJob
Predicates
REQUIRED_HEADERS libkleo_HEADERS
PREFIX Libkleo
RELATIVE kleo
......@@ -210,7 +211,7 @@ install(FILES
install(FILES
${libkleo_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/libkleo_export.h
${CMAKE_CURRENT_BINARY_DIR}/kleo_export.h
${libkleo_CamelCase_HEADERS}
${libkeo_ui_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/libkleo
......
......@@ -32,7 +32,7 @@
#include "qgpgmelistallkeysjob.h"
#include "kleopatra/models/predicates.h"
#include "kleo/predicates.h"
#include <gpgme++/key.h>
#include <gpgme++/context.h>
......
......@@ -28,10 +28,26 @@ set(QT_REQUIRED_VERSION "5.4.0")
set(KMIME_LIB_VERSION "4.87.0")
find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test UiTools WebKitWidgets)
find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5KaddressbookGrantlee ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5GrantleeTheme ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkleo ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimCommon ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MessageCore ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5IncidenceEditorsng ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
#KF5::Contacts
#${_mailwebview_lib}
#KF5::MailTransport
#KF5::Mbox
#KF5::AkonadiNotes
find_package(Grantlee5 "5.0" CONFIG REQUIRED)
ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX MESSAGEVIEWER
......
......@@ -37,9 +37,9 @@ find_package(KF5AkonadiMime ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
#find_package(KF5PimCommon ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
#find_package(KF5MessageViewer ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
#find_package(KF5MessageCore ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimCommon ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MessageViewer ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MessageCore ${KDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
ecm_setup_version(${KDEPIM_LIB_VERSION} VARIABLE_PREFIX TEMPLATEPARSER
......
......@@ -53,8 +53,8 @@ PRIVATE
KF5::Libkleo
)
set_target_properties(KF5TemplateParser PROPERTIES
VERSION ${KDEPIM_LIB_VERSION}
SOVERSION ${KDEPIM_LIB_SOVERSION}
VERSION ${TEMPLATEPARSER_VERSION_STRING}
SOVERSION ${TEMPLATEPARSER_SOVERSION}
EXPORT_NAME TemplateParser
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment