diff --git a/CMakeLists.txt b/CMakeLists.txt index 31ff6d9..2cc92c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,15 +9,14 @@ set(PROJECT_VERSION_MAJOR 5) set(CMAKE_C_STANDARD 99) -set(QT_MIN_VERSION "5.15.0") +set(QT_MIN_VERSION "6.2.0") set(KF5_MIN_VERSION "5.86") set(KDE_COMPILERSETTINGS_LEVEL "5.82") set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml) -find_package(Qt5XkbCommonSupport REQUIRED PRIVATE) +find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml) find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) @@ -38,8 +37,6 @@ find_package(Wayland 1.3 COMPONENTS Client Server) find_package(WaylandProtocols) find_package(PkgConfig REQUIRED) -pkg_check_modules(XKBCOMMON xkbcommon REQUIRED IMPORTED_TARGET) - set_package_properties(Wayland PROPERTIES TYPE REQUIRED) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90") diff --git a/LayerShellQtConfig.cmake.in b/LayerShellQtConfig.cmake.in index fdaa09c..58323bb 100644 --- a/LayerShellQtConfig.cmake.in +++ b/LayerShellQtConfig.cmake.in @@ -4,6 +4,6 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Gui "@QT_MIN_VERSION@") +find_dependency(Qt6Gui "@QT_MIN_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/LayerShellQtTargets.cmake") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d1a761d..8284497 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,7 @@ ecm_qt_declare_logging_category(LAYER_SHELL_SOURCES ) add_library(LayerShellQtInterface SHARED qwaylandlayersurface.cpp interfaces/window.cpp interfaces/shell.cpp qwaylandlayershellintegration.cpp qwaylandlayershell.cpp ${LAYER_SHELL_SOURCES}) -target_link_libraries(LayerShellQtInterface PRIVATE Qt::Gui Qt::WaylandClientPrivate Qt::XkbCommonSupportPrivate Wayland::Client PkgConfig::XKBCOMMON) +target_link_libraries(LayerShellQtInterface PRIVATE Qt::Gui Qt::WaylandClientPrivate Wayland::Client) target_include_directories(LayerShellQtInterface PUBLIC "$" INTERFACE "$" ) @@ -27,7 +27,7 @@ set_target_properties(LayerShellQtInterface PROPERTIES VERSION ${LAYERSHELLQT_ ) add_library(layer-shell SHARED qwaylandlayershellintegrationplugin.cpp) -target_link_libraries(layer-shell LayerShellQtInterface Qt::WaylandClient Qt::WaylandClientPrivate Qt::XkbCommonSupportPrivate Wayland::Client PkgConfig::XKBCOMMON) +target_link_libraries(layer-shell LayerShellQtInterface Qt::WaylandClient Qt::WaylandClientPrivate Wayland::Client) ecm_generate_headers(LayerShellQt_HEADERS HEADER_NAMES