summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2022-07-07 21:29:11 +0200
committerRobert Griebl <robert.griebl@qt.io>2022-07-15 16:39:41 +0000
commit725881d4a5820be588e0ee9ae3464745e076ff91 (patch)
tree8bcd94f60693069324e619fe50da4ac06f6a242c
parent2802f3a5a8d87edad34e9f2aa9b5cf069a0a7546 (diff)
downloadqtapplicationmanager-725881d4a5820be588e0ee9ae3464745e076ff91.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: Robert Griebl <robert.griebl@qt.io>
-rw-r--r--src/monitor-lib/CMakeLists.txt2
-rw-r--r--tests/auto/CMakeLists.txt6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/monitor-lib/CMakeLists.txt b/src/monitor-lib/CMakeLists.txt
index 212bf1c1..03f2ee5f 100644
--- a/src/monitor-lib/CMakeLists.txt
+++ b/src/monitor-lib/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_module(AppManMonitorPrivate
Qt::Gui
)
-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)