Commit 557c407b authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system for building against qt6

parent 09bb9362
Pipeline #121295 passed with stage
in 48 seconds
......@@ -106,7 +106,7 @@ install(EXPORT KF5AkonadiCalendarTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/akonadi-calendar_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel
)
ecm_qt_install_logging_categories(
EXPORT AKONADI-CALENDAR
......
......@@ -4,7 +4,7 @@
include(ECMMarkAsTest)
include(ECMAddTests)
find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
find_package(Qt${QT_MAJOR_VERSION}Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
......@@ -35,6 +35,6 @@ endif()
ecm_qt_declare_logging_category(akonadi_serializer_kcalcore_autotest_SRCS HEADER serializer_debug.h IDENTIFIER AKONADI_SERIALIZER_CALENDAR_LOG CATEGORY_NAME org.kde.pim.calendar_serializer)
ecm_add_test(kcalcoreserializertest.cpp ../serializers/akonadi_serializer_kcalcore.cpp ${akonadi_serializer_kcalcore_autotest_SRCS}
LINK_LIBRARIES KF5::CalendarUtils KF5::CalendarCore KF5::AkonadiCore KF5::I18n Qt::Test
LINK_LIBRARIES KF5::CalendarUtils KF5::CalendarCore KF5::AkonadiCore KF5::I18n Qt${QT_MAJOR_VERSION}::Test
TEST_NAME kcalcoreserializertest
)
......@@ -91,7 +91,7 @@ endif()
generate_export_header(KF5AkonadiCalendar BASE_NAME akonadi-calendar)
target_include_directories(KF5AkonadiCalendar INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/Akonadi/Calendar;${KDE_INSTALL_INCLUDEDIR_KF5}/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 PUBLIC "$<BUILD_INTERFACE:${Akonadi-Calendar_SOURCE_DIR}/src;${Akonadi-Calendar_BINARY_DIR}/src>")
target_link_libraries(KF5AkonadiCalendar
......@@ -152,12 +152,12 @@ ecm_generate_headers(AkonadiCalendar_CamelCase_HEADERS
install( FILES
${AkonadiCalendar_CamelCase_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Akonadi/Calendar COMPONENT Devel
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Akonadi/Calendar COMPONENT Devel
)
install( FILES
${CMAKE_CURRENT_BINARY_DIR}/akonadi-calendar_export.h
${AkonadiCalendar_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/calendarsettings.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/akonadi/calendar COMPONENT Devel
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/akonadi/calendar COMPONENT Devel
)
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