From 39a5ed4bdd348d3cd18a08d322b48d85e8d116e8 Mon Sep 17 00:00:00 2001 From: Elias Hautala Date: Mon, 14 Aug 2023 10:06:33 +0300 Subject: [PATCH] Exclude some examples from Android build Excludes dnslookup, waitconditions, semaphores, cbordump, savegame, convert, pingpong and complexpingpong examples from Android build because of missing Qui and Quick dependenies. Task-number: QTBUG-111933 Pick-to: 6.5 6.6 Change-Id: Ied01f62ee61a9220dcb44c13fda46f6a5e158293 Reviewed-by: Rami Potinkara Reviewed-by: Ville Voutilainen --- examples/corelib/serialization/CMakeLists.txt | 8 +++++--- examples/corelib/serialization/cbordump/CMakeLists.txt | 4 ++++ examples/corelib/serialization/convert/CMakeLists.txt | 4 ++++ examples/corelib/serialization/savegame/CMakeLists.txt | 4 ++++ examples/corelib/threads/CMakeLists.txt | 6 ++++-- examples/corelib/threads/semaphores/CMakeLists.txt | 4 ++++ examples/corelib/threads/waitconditions/CMakeLists.txt | 4 ++++ examples/dbus/CMakeLists.txt | 8 +++++--- examples/dbus/complexpingpong/CMakeLists.txt | 4 ++++ examples/dbus/pingpong/CMakeLists.txt | 4 ++++ examples/network/CMakeLists.txt | 2 +- examples/network/dnslookup/CMakeLists.txt | 4 ++++ 12 files changed, 47 insertions(+), 9 deletions(-) diff --git a/examples/corelib/serialization/CMakeLists.txt b/examples/corelib/serialization/CMakeLists.txt index ad14a179b1..8f6d57eba4 100644 --- a/examples/corelib/serialization/CMakeLists.txt +++ b/examples/corelib/serialization/CMakeLists.txt @@ -1,9 +1,11 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_example(cbordump) -qt_internal_add_example(convert) -qt_internal_add_example(savegame) +if(NOT ANDROID) + qt_internal_add_example(cbordump) + qt_internal_add_example(convert) + qt_internal_add_example(savegame) +endif() if(TARGET Qt6::Widgets) qt_internal_add_example(streambookmarks) endif() diff --git a/examples/corelib/serialization/cbordump/CMakeLists.txt b/examples/corelib/serialization/cbordump/CMakeLists.txt index 813b02b9c0..77e4a601a3 100644 --- a/examples/corelib/serialization/cbordump/CMakeLists.txt +++ b/examples/corelib/serialization/cbordump/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(cbordump 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/corelib/serialization/convert/CMakeLists.txt b/examples/corelib/serialization/convert/CMakeLists.txt index 5a10a78a5a..59d88b96e8 100644 --- a/examples/corelib/serialization/convert/CMakeLists.txt +++ b/examples/corelib/serialization/convert/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(convert 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/corelib/serialization/savegame/CMakeLists.txt b/examples/corelib/serialization/savegame/CMakeLists.txt index 8871a9d687..ab3d9a709f 100644 --- a/examples/corelib/serialization/savegame/CMakeLists.txt +++ b/examples/corelib/serialization/savegame/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(savegame 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/corelib/threads/CMakeLists.txt b/examples/corelib/threads/CMakeLists.txt index 4ced9a50e5..3548be9693 100644 --- a/examples/corelib/threads/CMakeLists.txt +++ b/examples/corelib/threads/CMakeLists.txt @@ -1,8 +1,10 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_example(semaphores) -qt_internal_add_example(waitconditions) +if(NOT ANDROID) + qt_internal_add_example(semaphores) + qt_internal_add_example(waitconditions) +endif() if(TARGET Qt6::Widgets) qt_internal_add_example(mandelbrot) qt_internal_add_example(queuedcustomtype) diff --git a/examples/corelib/threads/semaphores/CMakeLists.txt b/examples/corelib/threads/semaphores/CMakeLists.txt index bccf6e1e37..fee3f7a541 100644 --- a/examples/corelib/threads/semaphores/CMakeLists.txt +++ b/examples/corelib/threads/semaphores/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(semaphores 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/corelib/threads/waitconditions/CMakeLists.txt b/examples/corelib/threads/waitconditions/CMakeLists.txt index 45818e2bfc..a51cc5f876 100644 --- a/examples/corelib/threads/waitconditions/CMakeLists.txt +++ b/examples/corelib/threads/waitconditions/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(waitconditions 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/dbus/CMakeLists.txt b/examples/dbus/CMakeLists.txt index 738d1e47f7..b6276f562a 100644 --- a/examples/dbus/CMakeLists.txt +++ b/examples/dbus/CMakeLists.txt @@ -4,9 +4,11 @@ if(NOT TARGET Qt6::DBus) return() endif() -qt_internal_add_example(pingpong) -if(QT_FEATURE_process) - qt_internal_add_example(complexpingpong) +if(NOT ANDROID) + qt_internal_add_example(pingpong) + if(QT_FEATURE_process) + qt_internal_add_example(complexpingpong) + endif() endif() if(TARGET Qt6::Widgets) qt_internal_add_example(chat) diff --git a/examples/dbus/complexpingpong/CMakeLists.txt b/examples/dbus/complexpingpong/CMakeLists.txt index 377b56b1ab..3d7f008994 100644 --- a/examples/dbus/complexpingpong/CMakeLists.txt +++ b/examples/dbus/complexpingpong/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(complexpingpong 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/dbus/pingpong/CMakeLists.txt b/examples/dbus/pingpong/CMakeLists.txt index 5d59813784..d9b2844362 100644 --- a/examples/dbus/pingpong/CMakeLists.txt +++ b/examples/dbus/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() diff --git a/examples/network/CMakeLists.txt b/examples/network/CMakeLists.txt index 64068ba9a0..3aab043c58 100644 --- a/examples/network/CMakeLists.txt +++ b/examples/network/CMakeLists.txt @@ -4,7 +4,7 @@ if(NOT TARGET Qt6::Network) return() endif() -if(NOT INTEGRITY) +if(NOT INTEGRITY AND NOT ANDROID) qt_internal_add_example(dnslookup) endif() if(TARGET Qt6::Widgets) diff --git a/examples/network/dnslookup/CMakeLists.txt b/examples/network/dnslookup/CMakeLists.txt index e90cdaff2d..39f680f334 100644 --- a/examples/network/dnslookup/CMakeLists.txt +++ b/examples/network/dnslookup/CMakeLists.txt @@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(dnslookup 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()