diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-02-12 09:57:53 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-02-12 09:21:46 +0000 |
| commit | f6a830095fbb607307541305a03da663bfb82cf3 (patch) | |
| tree | f88efd5dd2797883692566f8f9b32e1b0e265ba2 | |
| parent | 3882e9ea09ec9062fd3c711ae6caadb69b67c752 (diff) | |
cmake: blacklist xlib test, we can just use X11_FOUND
Change-Id: Ic733c42e11b00fa8bf107f460a0596aeb10ac37b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/gui/configure.cmake | 20 | ||||
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 2 |
2 files changed, 3 insertions, 19 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index be3dff2f60..57c5083d47 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -400,25 +400,7 @@ glProgramUniform1i(0, 0, 0); } ") -# xlib -qt_config_compile_test(xlib - LABEL "XLib" - LIBRARIES X11::X11 - CODE -" -#include <X11/Xlib.h> -int main(int argc, char **argv) -{ - (void)argc; (void)argv; - /* BEGIN TEST: */ -Display *d = XOpenDisplay(NULL); -XCloseDisplay(d); - /* END TEST: */ - return 0; -} -" -) #### Features @@ -734,7 +716,7 @@ qt_feature("xkbcommon_evdev" PRIVATE qt_feature("xlib" PRIVATE LABEL "XLib" AUTODETECT NOT APPLE OR QT_FEATURE_xcb - CONDITION TEST_xlib + CONDITION X11_FOUND ) qt_feature("texthtmlparser" PUBLIC SECTION "Kernel" diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index d24a3d4b5e..6e6c402b07 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -187,6 +187,7 @@ def map_tests(test: str) -> str: 'reduce_exports': 'CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY', 'libinput_axis_api': 'ON', + "xlib": "X11_FOUND", } if test in testmap: return testmap.get(test, None) @@ -550,6 +551,7 @@ def parseTest(ctx, test, data, cm_fh): 'separate_debug_info', # FIXME: see if cmake can do this 'gc_binaries', 'libinput_axis_api', + 'xlib', } if test in skip_tests: |