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

Adapt build system to allow to build against qt6. Need to fix build as it use kdegame private code

parent 95625eb7
Pipeline #116326 passed with stage
in 41 seconds
......@@ -9,7 +9,7 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_
project(kfourinline VERSION ${RELEASE_SERVICE_VERSION})
set (QT_MIN_VERSION "5.15.0")
set (KF5_MIN_VERSION "5.89.0")
set (KF5_MIN_VERSION "5.90.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
......@@ -24,7 +24,8 @@ include(ECMQtDeclareLoggingCategory)
include(ECMSetupVersion)
include(FeatureSummary)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg)
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg)
find_package(Qt${QT_MAJOR_VERSION}QuickWidgets ${REQUIRED_QT_VERSION} CONFIG)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
Config
ConfigWidgets
......
......@@ -85,7 +85,7 @@ target_link_libraries(kfourinline
KF5::DNSSD
KF5::XmlGui
KF5::WidgetsAddons
Qt::Svg
Qt${QT_MAJOR_VERSION}::Svg
)
install(TARGETS kfourinline ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
......@@ -107,7 +107,7 @@ target_sources(kfourinlineproc PRIVATE
target_link_libraries(kfourinlineproc
KF5KDEGames
KF5KDEGamesPrivate
Qt::Svg
Qt${QT_MAJOR_VERSION}::Svg
)
install(TARGETS kfourinlineproc ${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