diff options
| author | Elias Hautala <elias.hautala@qt.io> | 2023-08-14 08:27:35 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-22 06:33:53 +0000 |
| commit | db0f9bcdf55a70c33473b41a838ea9fd7da686c7 (patch) | |
| tree | 282ebc87db3c95f82e723fed9bac5b8e711ca430 | |
| parent | 87701be905ca378d59883ceef2072e5250eae137 (diff) | |
Exclude pingpong and ftpclient examples from Android build
Excludes pingpong and ftpclient examples from Android build, because of
missing Qui and Quick dependencies which are needed on Android.
Task-number: QTBUG-111933
Change-Id: Ie5598913f87e115d01b1cfaa6e01bf94644cd83c
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 58175a834fd4c072b8ccb9b72947ece85d4a4ed1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/scxml/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/scxml/ftpclient/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/statemachine/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | examples/statemachine/pingpong/CMakeLists.txt | 4 |
4 files changed, 12 insertions, 3 deletions
diff --git a/examples/scxml/CMakeLists.txt b/examples/scxml/CMakeLists.txt index cf0c67f..137d92f 100644 --- a/examples/scxml/CMakeLists.txt +++ b/examples/scxml/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -if (TARGET Qt::Network AND QT_FEATURE_scxml_ecmascriptdatamodel) +if (TARGET Qt::Network AND QT_FEATURE_scxml_ecmascriptdatamodel AND NOT ANDROID) qt_internal_add_example(ftpclient) endif() diff --git a/examples/scxml/ftpclient/CMakeLists.txt b/examples/scxml/ftpclient/CMakeLists.txt index d93e1e9..af5dc29 100644 --- a/examples/scxml/ftpclient/CMakeLists.txt +++ b/examples/scxml/ftpclient/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(ftpclient LANGUAGES CXX) +if (ANDROID) + message(FATAL_ERROR "This project cannot be built on Android.") +endif() + if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() diff --git a/examples/statemachine/CMakeLists.txt b/examples/statemachine/CMakeLists.txt index 86db7fb..5056f34 100644 --- a/examples/statemachine/CMakeLists.txt +++ b/examples/statemachine/CMakeLists.txt @@ -1,8 +1,9 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_example(pingpong) - +if(NOT ANDROID) + qt_internal_add_example(pingpong) +endif() if(TARGET Qt::Widgets) qt_internal_add_example(rogue) qt_internal_add_example(trafficlight) diff --git a/examples/statemachine/pingpong/CMakeLists.txt b/examples/statemachine/pingpong/CMakeLists.txt index 040b004..ece2158 100644 --- a/examples/statemachine/pingpong/CMakeLists.txt +++ b/examples/statemachine/pingpong/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(pingpong LANGUAGES CXX) +if (ANDROID) + message(FATAL_ERROR "This project cannot be built on Android.") +endif() + if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() |