1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: blacklist xlib test, we can just use X11_FOUND

Browse Source 
Change-Id: Ic733c42e11b00fa8bf107f460a0596aeb10ac37b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Albert Astals Cid 2019-02-12 09:57:53 +01:00
parent 3882e9ea09
commit f6a830095f
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/configure.cmake
View File

@ -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 #### Features
@ -734,7 +716,7 @@ qt_feature("xkbcommon_evdev" PRIVATE
qt_feature("xlib" PRIVATE qt_feature("xlib" PRIVATE
LABEL "XLib" LABEL "XLib"
AUTODETECT NOT APPLE OR QT_FEATURE_xcb AUTODETECT NOT APPLE OR QT_FEATURE_xcb
CONDITION TEST_xlib CONDITION X11_FOUND
) )
qt_feature("texthtmlparser" PUBLIC qt_feature("texthtmlparser" PUBLIC
SECTION "Kernel" SECTION "Kernel"

2
util/cmake/configurejson2cmake.py
View File

@ -187,6 +187,7 @@ def map_tests(test: str) -> str:
'reduce_exports': 'CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY', 'reduce_exports': 'CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY',
'libinput_axis_api': 'ON', 'libinput_axis_api': 'ON',
"xlib": "X11_FOUND",
} }
if test in testmap: if test in testmap:
return testmap.get(test, None) 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 'separate_debug_info', # FIXME: see if cmake can do this
'gc_binaries', 'gc_binaries',
'libinput_axis_api', 'libinput_axis_api',
'xlib',
} }
if test in skip_tests: if test in skip_tests: