Attachment #783002 for bug #848771

View | Details | Raw Unified | Return to bug 848771
Collapse All | Expand All




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")

include(config-gentoo.cmake)
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(ConfigureChecks.cmake)





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)

Lines 4-10 if(X11_Xkb_FOUND AND XCB_XKB_FOUND) Link Here

(-)a/kcms/CMakeLists.txt (-2 / +2 lines)
4	add_subdirectory( keyboard )	4	add_subdirectory( keyboard )
5	endif()	5	endif()
6		6
7	if (EVDEV_FOUND AND XORGLIBINPUT_FOUND AND X11_Xi_FOUND)	7	if (X11_Xi_FOUND)
8	add_subdirectory( mouse )	8	add_subdirectory( mouse )
9	endif()	9	endif()
10		10
Lines 38-43 if (KF5Baloo_FOUND) Link Here
38	endif()	38	endif()
39	add_subdirectory(solid_actions)	39	add_subdirectory(solid_actions)
40		40
41	if (X11_XCB_FOUND AND X11_Xi_FOUND AND XORGSERVER_FOUND)	41	if (X11_XCB_FOUND AND X11_Xi_FOUND)
42	add_subdirectory(touchpad)	42	add_subdirectory(touchpad)
43	endif()	43	endif()




    backends/x11/xrecordkeyboardmonitor.cpp
)

if(HAVE_SYNAPTICS)
    list(APPEND backend_SRCS backends/x11/synapticstouchpad.cpp)
endif()

if (HAVE_XORGLIBINPUT)

    SET(backend_SRCS
        ${backend_SRCS}

    PkgConfig::XORGSERVER
)

if(HAVE_SYNAPTICS)
    list(APPEND backend_LIBS PkgConfig::SYNAPTICS)
endif()

- 

Return to bug 848771

Lines 156-178 set_package_properties(XCB PROPERTIES TYPE REQUIRED) Link Here

(-)a/CMakeLists.txt (-17 / +1 lines)
156	add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")	156	add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard")
157	add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")	157	add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation")
158		158
159	pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET)	159	include(config-gentoo.cmake)
160	pkg_check_modules(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET)
161	pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET)
162
163	ecm_find_qmlmodule(org.kde.pipewire 0.1)
164
165	find_package(Synaptics)
166	set_package_properties(Synaptics PROPERTIES TYPE OPTIONAL)
167	add_feature_info("Synaptics" SYNAPTICS_FOUND "Synaptics libraries are needed for the synaptics touchpad KCM")
168
169	if(SYNAPTICS_FOUND)
170	set(HAVE_SYNAPTICS 1)
171	endif()
172
173	if(XORGLIBINPUT_FOUND)
174	set(HAVE_XORGLIBINPUT 1)
175	endif()
176		160
177	include(ConfigureChecks.cmake)	161	include(ConfigureChecks.cmake)
178		162

Line 0 Link Here

(-)a/config-gentoo.cmake (+22 lines)
	1	add_library(PkgConfig::XORGLIBINPUT INTERFACE IMPORTED)
	2	set_property(TARGET PkgConfig::XORGLIBINPUT PROPERTY
	3	INTERFACE_INCLUDE_DIRECTORIES "${XORGLIBINPUT_INCLUDE_DIRS}"
	4	)
	5
	6	add_library(PkgConfig::EVDEV INTERFACE IMPORTED)
	7	set_property(TARGET PkgConfig::EVDEV PROPERTY
	8	INTERFACE_INCLUDE_DIRECTORIES "${EVDEV_INCLUDE_DIRS}"
	9	)
	10
	11	add_library(PkgConfig::XORGSERVER INTERFACE IMPORTED)
	12	set_property(TARGET PkgConfig::XORGSERVER PROPERTY
	13	INTERFACE_INCLUDE_DIRECTORIES "${XORGSERVER_INCLUDE_DIRS}"
	14	)
	15
	16	add_library(PkgConfig::SYNAPTICS INTERFACE IMPORTED)
	17	set_property(TARGET PkgConfig::SYNAPTICS PROPERTY
	18	INTERFACE_INCLUDE_DIRECTORIES "${SYNAPTICS_INCLUDE_DIRS}"
	19	)
	20
	21	set(HAVE_SYNAPTICS 1)
	22	set(HAVE_XORGLIBINPUT 1)

Lines 10-20 SET(backend_SRCS Link Here

(-)a/kcms/touchpad/backends/x11.cmake (-4 / +3 lines)
10	backends/x11/xrecordkeyboardmonitor.cpp	10	backends/x11/xrecordkeyboardmonitor.cpp
11	)	11	)
12		12
13	if(SYNAPTICS_FOUND)	13	if(HAVE_SYNAPTICS)
14	list(APPEND backend_SRCS backends/x11/synapticstouchpad.cpp)	14	list(APPEND backend_SRCS backends/x11/synapticstouchpad.cpp)
15	endif()	15	endif()
16		16
17	if (XORGLIBINPUT_FOUND)	17	if (HAVE_XORGLIBINPUT)
18		18
19	SET(backend_SRCS	19	SET(backend_SRCS
20	${backend_SRCS}	20	${backend_SRCS}
Lines 38-44 SET(backend_LIBS Link Here
38	PkgConfig::XORGSERVER	38	PkgConfig::XORGSERVER
39	)	39	)
40		40
41	if(SYNAPTICS_FOUND)	41	if(HAVE_SYNAPTICS)
42	list(APPEND backend_LIBS PkgConfig::SYNAPTICS)	42	list(APPEND backend_LIBS PkgConfig::SYNAPTICS)
43	endif()	43	endif()
44		44
45	-