diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-02-11 15:47:04 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-02-11 17:16:17 +0000 |
| commit | f18db41f8586e60460649b4032cc8b6c01700441 (patch) | |
| tree | f4fab3d90a502407dc7847d4298e44aff4b13ca0 /src | |
| parent | 93564b3f8be7506dbd9941ebc4fbdbf575f4beb4 (diff) | |
cmake: Find tslib and build the tslib plugin if found
Change-Id: I7119ddf473a3ede29bbfef23cffb08a4fcbd5681
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/configure.cmake | 6 | ||||
| -rw-r--r-- | src/platformsupport/input/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/generic/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/generic/tslib/CMakeLists.txt | 19 |
4 files changed, 27 insertions, 5 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 98eb8bba9d..3d5db4aa65 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -54,6 +54,8 @@ find_package(JPEG) set_package_properties(JPEG PROPERTIES TYPE OPTIONAL) find_package(PNG) set_package_properties(PNG PROPERTIES TYPE OPTIONAL) +find_package(Tslib) +set_package_properties(Tslib PROPERTIES TYPE OPTIONAL) find_package(Vulkan) set_package_properties(Vulkan PROPERTIES TYPE OPTIONAL) find_package(Wayland) @@ -436,8 +438,6 @@ XCloseDisplay(d); " ) - - #### Features qt_feature("accessibility_atspi_bridge" PUBLIC PRIVATE @@ -691,7 +691,7 @@ qt_feature("sessionmanager" PUBLIC qt_feature_definition("sessionmanager" "QT_NO_SESSIONMANAGER" NEGATE VALUE "1") qt_feature("tslib" PRIVATE LABEL "tslib" - CONDITION libs.tslib OR FIXME + CONDITION Tslib_FOUND ) qt_feature("tuiotouch" PRIVATE LABEL "TuioTouch" diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index c4aa6e1ccf..dc5b25c9ce 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -6,6 +6,9 @@ set_package_properties(Libinput PROPERTIES TYPE OPTIONAL) find_package(XKB) set_package_properties(XKB PROPERTIES TYPE OPTIONAL) +find_package(Tslib) +set_package_properties(Tslib PROPERTIES TYPE OPTIONAL) + ##################################################################### ## InputSupport Module: ##################################################################### @@ -65,7 +68,7 @@ extend_target(InputSupport CONDITION QT_FEATURE_tslib SOURCES tslib/qtslib.cpp tslib/qtslib_p.h LIBRARIES - tslib + PkgConfig::Tslib ) extend_target(InputSupport CONDITION QT_FEATURE_libinput diff --git a/src/plugins/generic/CMakeLists.txt b/src/plugins/generic/CMakeLists.txt index 616e940693..8fa648006a 100644 --- a/src/plugins/generic/CMakeLists.txt +++ b/src/plugins/generic/CMakeLists.txt @@ -10,7 +10,7 @@ if(QT_FEATURE_evdev) endif() if(QT_FEATURE_tslib) -# TODO add_subdirectory(tslib) + add_subdirectory(tslib) endif() if(QT_FEATURE_tuiotouch) diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt new file mode 100644 index 0000000000..33ee2a9564 --- /dev/null +++ b/src/plugins/generic/tslib/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from tslib.pro. + +##################################################################### +## qtslibplugin Plugin: +##################################################################### + +add_qt_plugin(qtslibplugin + TYPE generic + SOURCES + main.cpp + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + Qt::InputSupportPrivate + # OTHER_FILES = "tslib.json" + # PLUGIN_CLASS_NAME = "QTsLibPlugin" + # PLUGIN_EXTENDS = "-" + # _LOADED = "qt_plugin" +) |