[PoC] Use upstream cmake integration

Instead of using a custom find module for kwineffects use the new upstream cmake support from https://invent.kde.org/plasma/kwin/-/merge_requests/342
zzag · Oct 13, 2020 · d2477cc · d2477cc
1 parent 1e38dd1
commit d2477cc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 104 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,11 +32,15 @@ find_package(KF5 REQUIRED COMPONENTS
     WindowSystem
 )
 
-find_package(kwineffects REQUIRED COMPONENTS
+find_package(XCB)
+
+find_package(KWinEffects REQUIRED COMPONENTS
     kwineffects
     kwinglutils
 )
 
+find_package(KWaylandServer REQUIRED)
+
 find_package(KWinDBusInterface CONFIG REQUIRED)
 
 find_package(epoxy REQUIRED)

diff --git a/cmake/Modules/Findkwineffects.cmake b/cmake/Modules/Findkwineffects.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -22,8 +22,8 @@ target_link_libraries(kwin4_effect_yetanothermagiclamp
     KF5::ConfigGui
     KF5::CoreAddons
     KF5::WindowSystem
-    kwineffects::kwineffects
-    kwineffects::kwinglutils
+    KWinEffects::kwineffects
+    KWinEffects::kwinglutils
     ${epoxy_LIBRARY}
 )