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

cmake: Find tslib and build the tslib plugin if found

Browse Source 
Change-Id: I7119ddf473a3ede29bbfef23cffb08a4fcbd5681
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Albert Astals Cid 2019-02-11 15:47:04 +01:00
parent 93564b3f8b
commit f18db41f85
6 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/FindTslib.cmake Normal file
View File

@ -0,0 +1,3 @@
find_package(PkgConfig)
pkg_check_modules(Tslib tslib IMPORTED_TARGET)

6
src/gui/configure.cmake
View File

@ -54,6 +54,8 @@ find_package(JPEG)
set_package_properties(JPEG PROPERTIES TYPE OPTIONAL) set_package_properties(JPEG PROPERTIES TYPE OPTIONAL)
find_package(PNG) find_package(PNG)
set_package_properties(PNG PROPERTIES TYPE OPTIONAL) set_package_properties(PNG PROPERTIES TYPE OPTIONAL)
find_package(Tslib)
set_package_properties(Tslib PROPERTIES TYPE OPTIONAL)
find_package(Vulkan) find_package(Vulkan)
set_package_properties(Vulkan PROPERTIES TYPE OPTIONAL) set_package_properties(Vulkan PROPERTIES TYPE OPTIONAL)
find_package(Wayland) find_package(Wayland)
@ -436,8 +438,6 @@ XCloseDisplay(d);
" "
) )
#### Features #### Features
qt_feature("accessibility_atspi_bridge" PUBLIC PRIVATE 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_definition("sessionmanager" "QT_NO_SESSIONMANAGER" NEGATE VALUE "1")
qt_feature("tslib" PRIVATE qt_feature("tslib" PRIVATE
LABEL "tslib" LABEL "tslib"
CONDITION libs.tslib OR FIXME CONDITION Tslib_FOUND
) )
qt_feature("tuiotouch" PRIVATE qt_feature("tuiotouch" PRIVATE
LABEL "TuioTouch" LABEL "TuioTouch"

5
src/platformsupport/input/CMakeLists.txt
View File

@ -6,6 +6,9 @@ set_package_properties(Libinput PROPERTIES TYPE OPTIONAL)
find_package(XKB) find_package(XKB)
set_package_properties(XKB PROPERTIES TYPE OPTIONAL) set_package_properties(XKB PROPERTIES TYPE OPTIONAL)
find_package(Tslib)
set_package_properties(Tslib PROPERTIES TYPE OPTIONAL)
##################################################################### #####################################################################
## InputSupport Module: ## InputSupport Module:
##################################################################### #####################################################################
@ -65,7 +68,7 @@ extend_target(InputSupport CONDITION QT_FEATURE_tslib
SOURCES SOURCES
tslib/qtslib.cpp tslib/qtslib_p.h tslib/qtslib.cpp tslib/qtslib_p.h
LIBRARIES LIBRARIES
tslib PkgConfig::Tslib
) )
extend_target(InputSupport CONDITION QT_FEATURE_libinput extend_target(InputSupport CONDITION QT_FEATURE_libinput

2
src/plugins/generic/CMakeLists.txt
View File

@ -10,7 +10,7 @@ if(QT_FEATURE_evdev)
endif() endif()
if(QT_FEATURE_tslib) if(QT_FEATURE_tslib)
# TODO add_subdirectory(tslib) add_subdirectory(tslib)
endif() endif()
if(QT_FEATURE_tuiotouch) if(QT_FEATURE_tuiotouch)

19
src/plugins/generic/tslib/CMakeLists.txt Normal file
View File

@ -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"
)

1
util/cmake/configurejson2cmake.py
View File

@ -78,6 +78,7 @@ def map_library(lib: str) -> Union[str, LibraryMapping, List[str]]:
'pps': 'PPS', 'pps': 'PPS',
'slog2': 'Slog2', 'slog2': 'Slog2',
'sun_iconv': None, 'sun_iconv': None,
'tslib': 'Tslib',
'udev': 'Libudev', 'udev': 'Libudev',
'vulkan': 'Vulkan', 'vulkan': 'Vulkan',
'wayland_server': 'Wayland', 'wayland_server': 'Wayland',