Commit 37fb29dd authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system for building against qt6

parent 190d48be
......@@ -8,8 +8,8 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
project(kontrast VERSION ${RELEASE_SERVICE_VERSION})
set(QT_MIN_VERSION "5.14.0")
set(KF5_MIN_VERSION "5.70.0")
set(QT_MIN_VERSION "5.15.0")
set(KF5_MIN_VERSION "5.90.0")
include(FeatureSummary)
......@@ -35,11 +35,11 @@ ecm_setup_version(${PROJECT_VERSION}
)
################# Find dependencies #################
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Gui Qml QuickControls2 Svg Sql)
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Gui Qml QuickControls2 Svg Sql )
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 I18n CoreAddons)
if(NOT ANDROID)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus)
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus Widgets)
endif()
################# build and install #################
......
......@@ -5,18 +5,18 @@ add_executable(kontrast
resources.qrc)
target_link_libraries(kontrast
Qt5::Core
Qt5::Gui
Qt5::Qml
Qt5::Quick
Qt5::QuickControls2
Qt5::Sql
Qt5::Svg
Qt::Core
Qt::Gui
Qt::Qml
Qt::Quick
Qt::QuickControls2
Qt::Sql
Qt::Svg
KF5::I18n
KF5::CoreAddons)
if(TARGET Qt5::DBus)
target_link_libraries(kontrast Qt5::DBus)
if(TARGET Qt::DBus)
target_link_libraries(kontrast Qt::DBus Qt::Widgets)
endif()
install(TARGETS kontrast ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
Supports Markdown
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