diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-28 11:06:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-07-13 11:11:40 +0200 |
| commit | 734b635cf9a9316ddd05dc9d9abc0a93746fc7f3 (patch) | |
| tree | 49c6736d1c0c792326dd52b7541bea361c478609 /configure.cmake | |
| parent | b848c87dbbc317ad7186418a64670b52777d1393 (diff) | |
Adaptations for 90-based
Change-Id: I8402b044d8e12d75e144a00984b856f3de10bffd
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit 1d988d971bc4270ba3d148e8e2c143bf8f625b6e)
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index ec5ac2a8d..71821c484 100644 --- a/configure.cmake +++ b/configure.cmake @@ -29,6 +29,7 @@ if(PkgConfig_FOUND) pkg_check_modules(XCURSOR xcursor) pkg_check_modules(XI xi) pkg_check_modules(XRANDR xrandr) + pkg_check_modules(XSHMFENCE xshmfence) pkg_check_modules(XTST xtst) pkg_check_modules(NSS nss>=3.26) pkg_check_modules(X11 x11) @@ -315,6 +316,7 @@ qt_feature("webengine-ozone-x11" PRIVATE AND XPROTO_FOUND AND XRANDR_FOUND AND XTST_FOUND + AND XSHMFENCE_FOUND ) #### Support Checks @@ -406,7 +408,8 @@ add_check_for_support(webEngineError webEngineSupport CONDITION NOT LINUX OR DBUS_FOUND MESSAGE "Build requires dbus." ) -set(xcbSupport X11 LIBDRM XCOMPOSITE XCURSOR XRANDR XI XPROTO XTST) +# FIXME: This prevents non XCB Linux builds from building: +set(xcbSupport X11 LIBDRM XCOMPOSITE XCURSOR XRANDR XI XPROTO XSHMFENCE XTST) foreach(xs ${xcbSupport}) if(${xs}_FOUND) set(xcbErrorMessage "${xcbErrorMessage} ${xs}:YES") |