[patch] updated override-include-dirs.patch (working hack)

override-include-dirs.patch (text/plain), 3.88 KB, created by Duncan on 2022-06-06 02:21:27 UTC

From 7f3d47158f1c0b6ca4462d64a2c5f41ba88ea20e Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[e-mail]>
Date: Mon, 6 Apr 2020 00:41:07 +0200
Subject: [PATCH] Replace input drivers pkg_check_modules calls with manual
 targets

All they need is one header each, allow include dir overrides.

Evdev - evdev-properties.h
Synaptics - synaptics-properties.h
XorgLibinput - libinput-properties.h
XorgServer - xserver-properties.h
---
 CMakeLists.txt                   | 16 +---------------
 config-gentoo.cmake              | 22 ++++++++++++++++++++++
 kcms/CMakeLists.txt              |  4 ++--
 kcms/touchpad/backends/x11.cmake |  6 +++---
 4 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 config-gentoo.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50910d381..2d9705f54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,23 +156,7 @@ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
 add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")
 add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")
 
-pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET)
-pkg_check_modules(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
-pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
-
-ecm_find_qmlmodule(org.kde.pipewire 0.1)
-
-find_package(Synaptics)
-set_package_properties(Synaptics PROPERTIES TYPE OPTIONAL)
-add_feature_info("Synaptics" SYNAPTICS_FOUND "Synaptics libraries are needed for the synaptics touchpad KCM")
-
-if(SYNAPTICS_FOUND)
-    set(HAVE_SYNAPTICS 1)
-endif()
-
-if(XORGLIBINPUT_FOUND)
-  set(HAVE_XORGLIBINPUT 1)
-endif()
+include(config-gentoo.cmake)
 
 include(ConfigureChecks.cmake)
 
diff --git a/config-gentoo.cmake b/config-gentoo.cmake
new file mode 100644
index 000000000..2fb90cfee
--- /dev/null
+++ b/config-gentoo.cmake
@@ -0,0 +1,22 @@
+add_library(PkgConfig::XORGLIBINPUT INTERFACE IMPORTED)
+set_property(TARGET PkgConfig::XORGLIBINPUT PROPERTY
+             INTERFACE_INCLUDE_DIRECTORIES "${XORGLIBINPUT_INCLUDE_DIRS}"
+            )
+
+add_library(PkgConfig::EVDEV INTERFACE IMPORTED)
+set_property(TARGET PkgConfig::EVDEV PROPERTY
+             INTERFACE_INCLUDE_DIRECTORIES "${EVDEV_INCLUDE_DIRS}"
+            )
+
+add_library(PkgConfig::XORGSERVER INTERFACE IMPORTED)
+set_property(TARGET PkgConfig::XORGSERVER PROPERTY
+             INTERFACE_INCLUDE_DIRECTORIES "${XORGSERVER_INCLUDE_DIRS}"
+            )
+
+add_library(PkgConfig::SYNAPTICS INTERFACE IMPORTED)
+set_property(TARGET PkgConfig::SYNAPTICS PROPERTY
+             INTERFACE_INCLUDE_DIRECTORIES "${SYNAPTICS_INCLUDE_DIRS}"
+            )
+
+set(HAVE_SYNAPTICS 1)
+set(HAVE_XORGLIBINPUT 1)
diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
index 65e5e4aec..5d8a171ce 100644
--- a/kcms/CMakeLists.txt
+++ b/kcms/CMakeLists.txt
@@ -4,7 +4,7 @@ if(X11_Xkb_FOUND AND XCB_XKB_FOUND)
     add_subdirectory( keyboard )
 endif()
 
-if (EVDEV_FOUND AND XORGLIBINPUT_FOUND AND X11_Xi_FOUND)
+if (X11_Xi_FOUND)
     add_subdirectory( mouse )
 endif()
 
@@ -38,6 +38,6 @@ if (KF5Baloo_FOUND)
 endif()
 add_subdirectory(solid_actions)
 
-if (X11_XCB_FOUND AND X11_Xi_FOUND AND XORGSERVER_FOUND)
+if (X11_XCB_FOUND AND X11_Xi_FOUND)
     add_subdirectory(touchpad)
 endif()
diff --git a/kcms/touchpad/backends/x11.cmake b/kcms/touchpad/backends/x11.cmake
index 97ca69dec..c3cb818a2 100644
--- a/kcms/touchpad/backends/x11.cmake
+++ b/kcms/touchpad/backends/x11.cmake
@@ -10,11 +10,11 @@ SET(backend_SRCS
     backends/x11/xrecordkeyboardmonitor.cpp
 )
 
-if(SYNAPTICS_FOUND)
+if(HAVE_SYNAPTICS)
     list(APPEND backend_SRCS backends/x11/synapticstouchpad.cpp)
 endif()
 
-if (XORGLIBINPUT_FOUND)
+if (HAVE_XORGLIBINPUT)
 
     SET(backend_SRCS
         ${backend_SRCS}
@@ -38,7 +38,7 @@ SET(backend_LIBS
     PkgConfig::XORGSERVER
 )
 
-if(SYNAPTICS_FOUND)
+if(HAVE_SYNAPTICS)
     list(APPEND backend_LIBS PkgConfig::SYNAPTICS)
 endif()
 
-- 
2.31.1