Commit 8b380681 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system for building against qt6

parent e84223f7
Pipeline #121282 passed with stage
in 1 minute and 15 seconds
......@@ -54,7 +54,7 @@ set(KDEPIM_LIB_VERSION "${PIM_VERSION}")
set(KDEPIM_LIB_SOVERSION "5")
set(QT_REQUIRED_VERSION "5.15.2")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Gui Network Widgets)
find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Gui Network Widgets)
set(CALENDARUTILS_LIB_VERSION "5.19.40")
option(FILE_RESOURCES "Use file system resources instead of Akonadi resources." TRUE)
......@@ -82,7 +82,7 @@ find_package(KF5Service ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5WindowSystem ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(Phonon4Qt5 CONFIG REQUIRED)
find_package(Phonon4Qt${QT_MAJOR_VERSION} CONFIG REQUIRED)
find_package(KF5DocTools ${KF5_MIN_VERSION})
set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
......@@ -110,7 +110,7 @@ if (NOT APPLE)
find_package(X11)
endif()
if (X11_FOUND)
find_package(Qt5X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE)
find_package(Qt${QT_MAJOR_VERSION}X11Extras ${QT_REQUIRED_VERSION} REQUIRED NO_MODULE)
endif()
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
......
......@@ -282,7 +282,7 @@ target_link_libraries(kalarm_bin
KF5::XmlGui
KF5::KIOFileWidgets
KF5::Crash
Phonon::phonon4qt5
Phonon::phonon4qt${QT_MAJOR_VERSION}
KF5::AkonadiCore
KF5::AkonadiMime
KF5::AkonadiContact
......@@ -297,8 +297,8 @@ target_link_libraries(kalarm_bin
KF5::PimCommon
)
if (Qt5X11Extras_FOUND)
target_link_libraries(kalarm_bin Qt::X11Extras ${X11_X11_LIB})
if (Qt${QT_MAJOR_VERSION}X11Extras_FOUND)
target_link_libraries(kalarm_bin Qt${QT_MAJOR_VERSION}::X11Extras ${X11_X11_LIB})
endif()
......
......@@ -21,7 +21,7 @@ add_executable(kalarmautostart ${kalarmautostart_SRCS})
target_link_libraries(kalarmautostart
KF5::I18n
KF5::CoreAddons
Qt::Widgets
Qt::DBus)
Qt${QT_MAJOR_VERSION}::Widgets
Qt${QT_MAJOR_VERSION}::DBus)
install(TARGETS kalarmautostart ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
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