Commit a446b69d authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use new akonadi calendar install include

parent 08611897
......@@ -3,7 +3,7 @@
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
set(PIM_VERSION "5.19.41")
set(PIM_VERSION "5.19.42")
project(Akonadi-Calendar VERSION ${PIM_VERSION})
# ECM setup
......@@ -107,7 +107,7 @@ install(EXPORT KF5AkonadiCalendarTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/akonadi-calendar_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}AkonadiCalendar COMPONENT Devel
)
ecm_qt_install_logging_categories(
EXPORT AKONADI-CALENDAR
......
......@@ -4,7 +4,7 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include <Akonadi/Calendar/ETMCalendar>
#include <Akonadi/ETMCalendar>
#include <KCheckableProxyModel>
#include <QApplication>
......
......@@ -91,7 +91,7 @@ endif()
generate_export_header(KF5AkonadiCalendar BASE_NAME akonadi-calendar)
target_include_directories(KF5AkonadiCalendar INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/Akonadi/Calendar;${KDE_INSTALL_INCLUDEDIR_KF}/akonadi/calendar>")
target_include_directories(KF5AkonadiCalendar INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiCalendar>")
target_include_directories(KF5AkonadiCalendar PUBLIC "$<BUILD_INTERFACE:${Akonadi-Calendar_SOURCE_DIR}/src;${Akonadi-Calendar_BINARY_DIR}/src>")
target_link_libraries(KF5AkonadiCalendar
......@@ -147,17 +147,17 @@ ecm_generate_headers(AkonadiCalendar_CamelCase_HEADERS
StandardCalendarActionManager
TodoPurger
REQUIRED_HEADERS AkonadiCalendar_HEADERS
PREFIX Akonadi/Calendar
PREFIX Akonadi
)
install( FILES
${AkonadiCalendar_CamelCase_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Akonadi/Calendar COMPONENT Devel
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiCalendar/Akonadi COMPONENT Devel
)
install( FILES
${CMAKE_CURRENT_BINARY_DIR}/akonadi-calendar_export.h
${AkonadiCalendar_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/calendarsettings.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/akonadi/calendar COMPONENT Devel
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiCalendar/akonadi COMPONENT Devel
)
......@@ -6,6 +6,6 @@ ItemAccessors=true
Mutators=true
Visibility=AKONADI_CALENDAR_EXPORT
SetUserTexts=true
IncludeFiles=akonadi-calendar_export.h
IncludeFiles=\"akonadi-calendar_export.h\"
TranslationDomain=libakonadi-calendar5
TranslationSystem=kde
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