diff options
| -rw-r--r-- | src/gui/configure.cmake | 20 | ||||
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 3 |
2 files changed, 4 insertions, 19 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 3d5db4aa657..be3dff2f602 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -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 qt_config_compile_test(linuxfb LABEL "LinuxFB" @@ -536,7 +518,7 @@ qt_feature("integrityhid" PRIVATE ) qt_feature("libinput_axis_api" PRIVATE LABEL "axis API in libinput" - CONDITION QT_FEATURE_libinput AND TEST_libinput_axis_api + CONDITION QT_FEATURE_libinput AND ON ) qt_feature("linuxfb" PRIVATE SECTION "Platform plugins" diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 2d635e0c8a2..5a2b95d6991 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -184,6 +184,8 @@ def map_tests(test: str) -> str: 'openssl11': '(OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0")', 'reduce_exports': 'CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY', + + 'libinput_axis_api': 'ON', } if test in testmap: return testmap.get(test, None) @@ -546,6 +548,7 @@ def parseTest(ctx, test, data, cm_fh): 'posix-iconv', "sun-iconv", 'separate_debug_info', # FIXME: see if cmake can do this 'gc_binaries', + 'libinput_axis_api', } if test in skip_tests: |