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

cmake: Blacklist the libinput_axis_api test

Browse Source 
We already have a cmake find module for libinput so we know it is there

Change-Id: I153544c5c13cb57b1ce258243ede17f4be9507fd
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Albert Astals Cid 2019-02-11 23:01:27 +01:00
parent 8d05d88ab9
commit 71c9db7da8
2 changed files with 4 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

@ -332,24 +332,6 @@ FBDriver *driver = 0;
} }
") ")
# libinput_axis_api
qt_config_compile_test(libinput_axis_api
LABEL "axis API in libinput"
LIBRARIES Libinput::Libinput
CODE
"
#include <libinput.h>
int main(int argc, char **argv)
{
(void)argc; (void)argv;
/* BEGIN TEST: */
libinput_event_pointer_has_axis(nullptr, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
/* END TEST: */
return 0;
}
")
# linuxfb # linuxfb
qt_config_compile_test(linuxfb qt_config_compile_test(linuxfb
LABEL "LinuxFB" LABEL "LinuxFB"
@ -536,7 +518,7 @@ qt_feature("integrityhid" PRIVATE
) )
qt_feature("libinput_axis_api" PRIVATE qt_feature("libinput_axis_api" PRIVATE
LABEL "axis API in libinput" LABEL "axis API in libinput"
CONDITION QT_FEATURE_libinput AND TEST_libinput_axis_api CONDITION QT_FEATURE_libinput AND ON
) )
qt_feature("linuxfb" PRIVATE qt_feature("linuxfb" PRIVATE
SECTION "Platform plugins" SECTION "Platform plugins"

3
util/cmake/configurejson2cmake.py
View File

@ -184,6 +184,8 @@ def map_tests(test: str) -> str:
'openssl11': '(OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0")', 'openssl11': '(OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0")',
'reduce_exports': 'CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY', 'reduce_exports': 'CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY',
'libinput_axis_api': 'ON',
} }
if test in testmap: if test in testmap:
return testmap.get(test, None) return testmap.get(test, None)
@ -546,6 +548,7 @@ def parseTest(ctx, test, data, cm_fh):
'posix-iconv', "sun-iconv", 'posix-iconv', "sun-iconv",
'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',
} }
if test in skip_tests: if test in skip_tests: