AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Find mtdev and use it

Browse Source 
Change-Id: I90db48efaa6a23add770fcf69b46c4f4c84866c1
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Albert Astals Cid 2019-02-12 10:47:12 +01:00
parent bb2ae3e409
commit 05aeaed906
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/FindMtdev.cmake Normal file
View File

@ -0,0 +1,3 @@
find_package(PkgConfig)
pkg_check_modules(Mtdev mtdev IMPORTED_TARGET)

4
src/gui/configure.cmake
View File

@ -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(Mtdev)
set_package_properties(Mtdev PROPERTIES TYPE OPTIONAL)
find_package(Tslib)
set_package_properties(Tslib PROPERTIES TYPE OPTIONAL)
find_package(Vulkan)
@ -531,7 +533,7 @@ qt_feature("mirclient" PRIVATE
)
qt_feature("mtdev" PRIVATE
LABEL "mtdev"
CONDITION libs.mtdev OR FIXME
CONDITION Mtdev_FOUND
)
qt_feature("opengles2" PUBLIC
LABEL "OpenGL ES 2.0"

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

@ -9,6 +9,9 @@ set_package_properties(XKB PROPERTIES TYPE OPTIONAL)
find_package(Tslib)
set_package_properties(Tslib PROPERTIES TYPE OPTIONAL)
find_package(Mtdev)
set_package_properties(Mtdev PROPERTIES TYPE OPTIONAL)
#####################################################################
## InputSupport Module:
#####################################################################
@ -61,7 +64,7 @@ extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
LIBRARIES
mtdev
PkgConfig::Mtdev
)
extend_target(InputSupport CONDITION QT_FEATURE_tslib

1
util/cmake/configurejson2cmake.py
View File

@ -73,6 +73,7 @@ def map_library(lib: str) -> Union[str, LibraryMapping, List[str]]:
'librt': 'WrapRt',
'libudev': 'Libudev',
'lttng-ust': LibraryMapping(package='LTTngUST', resultVariable="LTTNGUST"),
'mtdev': 'Mtdev',
'opengl': LibraryMapping(package="OpenGL", resultVariable="OpenGL_OpenGL"),
'openssl': 'OpenSSL',
'openssl_headers': LibraryMapping(package="OpenSSL", resultVariable="OPENSSL_INCLUDE_DIR", appendFoundSuffix=False),