[plasma/libkscreen] /: Fix cmake using --warn-uninitialized -Werror=dev
Laurent Montel <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit ff774f8b549a638037ab0dd4bd41710ff41b31b9 by Laurent Montel.
Committed on 22/07/2026 at 08:35.
Pushed by mlaurent into branch 'master'.
Fix cmake using --warn-uninitialized -Werror=dev
M +2 -2 CMakeLists.txt
M +2 -2 autotests/CMakeLists.txt
M +0 -2 src/CMakeLists.txt
https://invent.kde.org/plasma/libkscreen/-/commit/ff774f8b549a638037ab0dd4bd41710ff41b31b9
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 574f95e1..742c5735 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(KDEInstallDirs)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
@@ -31,7 +31,7 @@ include(ECMDeprecationSettings)
find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Gui Test WaylandClient)
-find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
+find_package(Qt6GuiPrivate ${QT_MIN_VERSION} REQUIRED NO_MODULE)
find_package(WaylandScanner)
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 830ef545..161d55ab 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -4,9 +4,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/tests/kwayla
macro(KSCREEN_ADD_TEST)
foreach(_testname ${ARGN})
- set(test_SRCS ${_testname}.cpp ${KSCREEN_WAYLAND_SRCS})
+ set(test_SRCS ${_testname}.cpp)
add_executable(${_testname} ${test_SRCS})
- target_link_libraries(${_testname} Qt::Core Qt::Gui Qt::Test KF6::Screen ${KSCREEN_WAYLAND_LIBS})
+ target_link_libraries(${_testname} Qt::Core Qt::Gui Qt::Test KF6::Screen)
add_test(NAME kscreen-${_testname}
COMMAND dbus-launch $<TARGET_FILE:${_testname}>
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 57de6675..1bd6f36a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,8 +67,6 @@ qt6_generate_wayland_protocol_client_sources(KF6Screen
${PLASMA_WAYLAND_PROTOCOLS_DIR}/kde-output-management-v2.xml
)
-target_sources(KF6Screen PRIVATE ${wayland_SRCS})
-
target_link_libraries(KF6Screen
PUBLIC
Qt::Core