aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElias Hautala <elias.hautala@qt.io>2023-08-09 15:33:22 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-08-21 08:47:27 +0000
commit9fc3ff494bcfa870837d64149f8e4c057c0b0427 (patch)
tree9b8f8f506de7c625f98d5cad35678778466867f7
parent8a1036f9118a68126e8bd0d4c263e6c49f6fde1b (diff)
Exclude some examples from build for Android
Exclude echoclient, echoserver, simplechat, sslechoserver and sslechoclient examples from build for Android because those examples can't be built for Android. Task-number: QTBUG-111933 Change-Id: I88c58b7d3530bf81aba66c97b85cd677108d1f00 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit 885888b79fb3047eb7b89d557a4e4bb7a5315ff2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/websockets/CMakeLists.txt14
-rw-r--r--examples/websockets/echoclient/CMakeLists.txt4
-rw-r--r--examples/websockets/echoserver/CMakeLists.txt4
-rw-r--r--examples/websockets/simplechat/CMakeLists.txt4
-rw-r--r--examples/websockets/sslechoclient/CMakeLists.txt4
-rw-r--r--examples/websockets/sslechoserver/CMakeLists.txt4
6 files changed, 28 insertions, 6 deletions
diff --git a/examples/websockets/CMakeLists.txt b/examples/websockets/CMakeLists.txt
index 25901f5..b855f70 100644
--- a/examples/websockets/CMakeLists.txt
+++ b/examples/websockets/CMakeLists.txt
@@ -1,14 +1,16 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
-qt_internal_add_example(echoclient)
-qt_internal_add_example(echoserver)
-qt_internal_add_example(simplechat)
if(TARGET Qt::Quick)
qt_internal_add_example(qmlwebsocketclient)
qt_internal_add_example(qmlwebsocketserver)
endif()
-if(QT_FEATURE_ssl)
- qt_internal_add_example(sslechoserver)
- qt_internal_add_example(sslechoclient)
+if (NOT ANDROID)
+ qt_internal_add_example(echoclient)
+ qt_internal_add_example(echoserver)
+ qt_internal_add_example(simplechat)
+ if(QT_FEATURE_ssl)
+ qt_internal_add_example(sslechoserver)
+ qt_internal_add_example(sslechoclient)
+ endif()
endif()
diff --git a/examples/websockets/echoclient/CMakeLists.txt b/examples/websockets/echoclient/CMakeLists.txt
index 3f92c26..bf6461f 100644
--- a/examples/websockets/echoclient/CMakeLists.txt
+++ b/examples/websockets/echoclient/CMakeLists.txt
@@ -4,6 +4,10 @@
cmake_minimum_required(VERSION 3.16)
project(echoclient LANGUAGES CXX)
+if (ANDROID)
+ message(FATAL_ERROR "This project cannot be built on Android.")
+endif()
+
set(CMAKE_AUTOMOC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
diff --git a/examples/websockets/echoserver/CMakeLists.txt b/examples/websockets/echoserver/CMakeLists.txt
index 6390ee3..f59a720 100644
--- a/examples/websockets/echoserver/CMakeLists.txt
+++ b/examples/websockets/echoserver/CMakeLists.txt
@@ -4,6 +4,10 @@
cmake_minimum_required(VERSION 3.16)
project(echoserver LANGUAGES CXX)
+if (ANDROID)
+ message(FATAL_ERROR "This project cannot be built on Android.")
+endif()
+
set(CMAKE_AUTOMOC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
diff --git a/examples/websockets/simplechat/CMakeLists.txt b/examples/websockets/simplechat/CMakeLists.txt
index f59f1e7..b1164b4 100644
--- a/examples/websockets/simplechat/CMakeLists.txt
+++ b/examples/websockets/simplechat/CMakeLists.txt
@@ -4,6 +4,10 @@
cmake_minimum_required(VERSION 3.16)
project(simplechatserver LANGUAGES CXX)
+if (ANDROID)
+ message(FATAL_ERROR "This project cannot be built on Android.")
+endif()
+
set(CMAKE_AUTOMOC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
diff --git a/examples/websockets/sslechoclient/CMakeLists.txt b/examples/websockets/sslechoclient/CMakeLists.txt
index b629a9d..6c2ae82 100644
--- a/examples/websockets/sslechoclient/CMakeLists.txt
+++ b/examples/websockets/sslechoclient/CMakeLists.txt
@@ -4,6 +4,10 @@
cmake_minimum_required(VERSION 3.16)
project(sslechoclient LANGUAGES CXX)
+if (ANDROID)
+ message(FATAL_ERROR "This project cannot be built on Android.")
+endif()
+
set(CMAKE_AUTOMOC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)
diff --git a/examples/websockets/sslechoserver/CMakeLists.txt b/examples/websockets/sslechoserver/CMakeLists.txt
index 7288373..497c17e 100644
--- a/examples/websockets/sslechoserver/CMakeLists.txt
+++ b/examples/websockets/sslechoserver/CMakeLists.txt
@@ -4,6 +4,10 @@
cmake_minimum_required(VERSION 3.16)
project(sslechoserver LANGUAGES CXX)
+if (ANDROID)
+ message(FATAL_ERROR "This project cannot be built on Android.")
+endif()
+
set(CMAKE_AUTOMOC ON)
if(NOT DEFINED INSTALL_EXAMPLESDIR)