diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2022-07-07 21:29:11 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-07 20:56:06 +0000 |
| commit | f9fc058e550affbb914ce0d6f391b448d5ae77ed (patch) | |
| tree | 9cfae508173794f80bb27ad7d553fbc237f1ac12 | |
| parent | 320ed1022f147554d801d5e7d64b3c7d722f5da0 (diff) | |
| download | qtapplicationmanager-f9fc058e550affbb914ce0d6f391b448d5ae77ed.tar.gz | |
Some tests cannot be built for Android
Change-Id: Ie97dd699e49119514652ca9d97ba7de80a90a544
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 7713f49ebb04f678a81b0c7cfcacd0880bd2661c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/monitor-lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/CMakeLists.txt | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/monitor-lib/CMakeLists.txt b/src/monitor-lib/CMakeLists.txt index f884cec0..a4286725 100644 --- a/src/monitor-lib/CMakeLists.txt +++ b/src/monitor-lib/CMakeLists.txt @@ -19,7 +19,7 @@ qt_internal_add_module(AppManMonitorPrivate AM_COMPILING_APPMAN ) -qt_internal_extend_target(AppManMonitorPrivate CONDITION LINUX +qt_internal_extend_target(AppManMonitorPrivate CONDITION (LINUX OR ANDROID) SOURCES sysfsreader.cpp sysfsreader.h ) diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 66d5d849..ca646a23 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -10,13 +10,15 @@ add_subdirectory(main) add_subdirectory(packagecreator) add_subdirectory(packageextractor) add_subdirectory(packager-tool) -add_subdirectory(qml) +if (NOT ANDROID) + add_subdirectory(qml) +endif() add_subdirectory(runtime) add_subdirectory(signature) add_subdirectory(utilities) add_subdirectory(yaml) -if(LINUX) +if (LINUX) add_subdirectory(systemreader) add_subdirectory(processreader) add_subdirectory(sudo) |