Commit 582fa9eb authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt build system for building against qt6

parent 8ca1b187
......@@ -13,7 +13,7 @@ if(NOT UNIX)
endif(NOT UNIX)
set (QT_MIN_VERSION "5.15.0")
set (KF5_MIN_VERSION "5.85.0")
set (KF5_MIN_VERSION "5.90.0")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
......@@ -36,7 +36,7 @@ ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX KDFPRIVATE
SOVERSION ${RELEASE_SERVICE_VERSION_MAJOR}
)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED
Core
Gui
Widgets
......
......@@ -2,6 +2,6 @@
########### install files ###############
install( PROGRAMS org.kde.kdf.desktop org.kde.kwikdisk.desktop DESTINATION ${KDE_INSTALL_APPDIR})
install( FILES kdfui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdf)
install( FILES kcmdf.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( FILES kdfui.rc DESTINATION ${KDE_INSTALL_KXMLGUIDIR}/kdf)
install( FILES kcmdf.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR} )
install(FILES org.kde.kdf.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
......@@ -37,7 +37,7 @@ ki18n_wrap_ui(kdfprivate_SRCS
add_library(kdfprivate ${kdfprivate_SRCS})
generate_export_header(kdfprivate BASE_NAME kdfprivate)
target_link_libraries(kdfprivate PUBLIC
Qt::Core
Qt${QT_MAJOR_VERSION}::Core
KF5::Completion
KF5::ConfigWidgets
KF5::I18n
......@@ -87,7 +87,7 @@ add_executable(kwikdisk ${kwikdisk_SRCS})
target_link_libraries(kwikdisk
kdfprivate
Qt::Core
Qt${QT_MAJOR_VERSION}::Core
KF5::KIOWidgets
KF5::Notifications
)
......@@ -107,7 +107,7 @@ add_library(kcm_kdf ${kcm_kdf_PART_SRCS})
kcoreaddons_desktop_to_json(kcm_kdf "../desktop/kcmdf.desktop" SERVICE_TYPES kcmodule.desktop)
target_link_libraries(kcm_kdf
kdfprivate
Qt::Core
Qt${QT_MAJOR_VERSION}::Core
)
install(TARGETS kcm_kdf DESTINATION ${KDE_INSTALL_PLUGINDIR})
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