From b102b41be71a18dbc94e289051ddb3437824ae35 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 29 Oct 2018 17:09:14 +0100 Subject: [PATCH] Add ATSPI2 library support Change-Id: I304ba2b9df65008340b698eb3a74dc3b4abfb826 Reviewed-by: Simon Hausmann --- cmake/FindATSPI2.cmake | 3 +++ src/gui/configure.cmake | 4 +++- util/cmake/configurejson2cmake.py | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 cmake/FindATSPI2.cmake diff --git a/cmake/FindATSPI2.cmake b/cmake/FindATSPI2.cmake new file mode 100644 index 00000000000..eb87a33e84f --- /dev/null +++ b/cmake/FindATSPI2.cmake @@ -0,0 +1,3 @@ +include(FindPkgConfig) + +pkg_check_modules(ATSPI2 atspi-2 IMPORTED_TARGET) diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index be056b34e3a..002d46c2728 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -34,6 +34,8 @@ set_property(CACHE INPUT_xkbcommon_x11 PROPERTY STRINGS undefined no qt system) #### Libraries +find_package(ATSPI2) +set_package_properties(ATSPI2 PROPERTIES TYPE OPTIONAL) find_package(Libdrm) set_package_properties(Libdrm PROPERTIES TYPE OPTIONAL) find_package(OpenGL) @@ -430,7 +432,7 @@ XCloseDisplay(d); qt_feature("accessibility_atspi_bridge" PUBLIC PRIVATE LABEL "ATSPI Bridge" - CONDITION QT_FEATURE_accessibility AND QT_FEATURE_xcb AND QT_FEATURE_dbus AND libs.atspi OR FIXME + CONDITION QT_FEATURE_accessibility AND QT_FEATURE_xcb AND QT_FEATURE_dbus AND ATSPI2_FOUND ) qt_feature_definition("accessibility_atspi_bridge" "QT_NO_ACCESSIBILITY_ATSPI_BRIDGE" NEGATE VALUE "1") qt_feature("angle" PUBLIC diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 513f7498dd4..934c53f3540 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -47,6 +47,7 @@ class LibraryMapping: def map_library(lib: str) -> Union[str, LibraryMapping, List[str]]: libmap = { + 'atspi': 'ATSPI2', 'double-conversion': 'WrapDoubleConversion', 'drm': 'Libdrm', 'egl': LibraryMapping(package="OpenGL", resultVariable="OpenGL_EGL"),