diff options
author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-02-12 10:47:12 +0100 |
---|---|---|
committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-02-12 13:35:07 +0000 |
commit | 05aeaed906cbec3654178d1438ae2ad361a35ddd (patch) | |
tree | 0a428ed50fb9b7d1317cff62b06465226f861324 /src | |
parent | bb2ae3e409acd88877ddf3d19054a0842404b568 (diff) |
Find mtdev and use it
Change-Id: I90db48efaa6a23add770fcf69b46c4f4c84866c1
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/configure.cmake | 4 | ||||
-rw-r--r-- | src/platformsupport/input/CMakeLists.txt | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index f3a439a862..e5888cc1d7 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(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" diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index dc5b25c9ce..43fb26d303 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -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 |