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 <rami.potinkara@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This commit is contained in:
parent
c95555e9f7
commit
39a5ed4bdd
@ -1,9 +1,11 @@
|
|||||||
# Copyright (C) 2022 The Qt Company Ltd.
|
# Copyright (C) 2022 The Qt Company Ltd.
|
||||||
# SPDX-License-Identifier: BSD-3-Clause
|
# SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
|
||||||
qt_internal_add_example(cbordump)
|
if(NOT ANDROID)
|
||||||
qt_internal_add_example(convert)
|
qt_internal_add_example(cbordump)
|
||||||
qt_internal_add_example(savegame)
|
qt_internal_add_example(convert)
|
||||||
|
qt_internal_add_example(savegame)
|
||||||
|
endif()
|
||||||
if(TARGET Qt6::Widgets)
|
if(TARGET Qt6::Widgets)
|
||||||
qt_internal_add_example(streambookmarks)
|
qt_internal_add_example(streambookmarks)
|
||||||
endif()
|
endif()
|
||||||
|
@ -4,6 +4,10 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
project(cbordump LANGUAGES CXX)
|
project(cbordump LANGUAGES CXX)
|
||||||
|
|
||||||
|
if (ANDROID)
|
||||||
|
message(FATAL_ERROR "This project cannot be built on Android.")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
||||||
set(INSTALL_EXAMPLESDIR "examples")
|
set(INSTALL_EXAMPLESDIR "examples")
|
||||||
endif()
|
endif()
|
||||||
|
@ -4,6 +4,10 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
project(convert LANGUAGES CXX)
|
project(convert LANGUAGES CXX)
|
||||||
|
|
||||||
|
if (ANDROID)
|
||||||
|
message(FATAL_ERROR "This project cannot be built on Android.")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
||||||
set(INSTALL_EXAMPLESDIR "examples")
|
set(INSTALL_EXAMPLESDIR "examples")
|
||||||
endif()
|
endif()
|
||||||
|
@ -4,6 +4,10 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
project(savegame LANGUAGES CXX)
|
project(savegame LANGUAGES CXX)
|
||||||
|
|
||||||
|
if (ANDROID)
|
||||||
|
message(FATAL_ERROR "This project cannot be built on Android.")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
||||||
set(INSTALL_EXAMPLESDIR "examples")
|
set(INSTALL_EXAMPLESDIR "examples")
|
||||||
endif()
|
endif()
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
# Copyright (C) 2022 The Qt Company Ltd.
|
# Copyright (C) 2022 The Qt Company Ltd.
|
||||||
# SPDX-License-Identifier: BSD-3-Clause
|
# SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
|
||||||
qt_internal_add_example(semaphores)
|
if(NOT ANDROID)
|
||||||
qt_internal_add_example(waitconditions)
|
qt_internal_add_example(semaphores)
|
||||||
|
qt_internal_add_example(waitconditions)
|
||||||
|
endif()
|
||||||
if(TARGET Qt6::Widgets)
|
if(TARGET Qt6::Widgets)
|
||||||
qt_internal_add_example(mandelbrot)
|
qt_internal_add_example(mandelbrot)
|
||||||
qt_internal_add_example(queuedcustomtype)
|
qt_internal_add_example(queuedcustomtype)
|
||||||
|
@ -4,6 +4,10 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
project(semaphores LANGUAGES CXX)
|
project(semaphores LANGUAGES CXX)
|
||||||
|
|
||||||
|
if (ANDROID)
|
||||||
|
message(FATAL_ERROR "This project cannot be built on Android.")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
||||||
set(INSTALL_EXAMPLESDIR "examples")
|
set(INSTALL_EXAMPLESDIR "examples")
|
||||||
endif()
|
endif()
|
||||||
|
@ -4,6 +4,10 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
project(waitconditions LANGUAGES CXX)
|
project(waitconditions LANGUAGES CXX)
|
||||||
|
|
||||||
|
if (ANDROID)
|
||||||
|
message(FATAL_ERROR "This project cannot be built on Android.")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
||||||
set(INSTALL_EXAMPLESDIR "examples")
|
set(INSTALL_EXAMPLESDIR "examples")
|
||||||
endif()
|
endif()
|
||||||
|
@ -4,9 +4,11 @@
|
|||||||
if(NOT TARGET Qt6::DBus)
|
if(NOT TARGET Qt6::DBus)
|
||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
qt_internal_add_example(pingpong)
|
if(NOT ANDROID)
|
||||||
if(QT_FEATURE_process)
|
qt_internal_add_example(pingpong)
|
||||||
qt_internal_add_example(complexpingpong)
|
if(QT_FEATURE_process)
|
||||||
|
qt_internal_add_example(complexpingpong)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
if(TARGET Qt6::Widgets)
|
if(TARGET Qt6::Widgets)
|
||||||
qt_internal_add_example(chat)
|
qt_internal_add_example(chat)
|
||||||
|
@ -4,6 +4,10 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
project(complexpingpong LANGUAGES CXX)
|
project(complexpingpong LANGUAGES CXX)
|
||||||
|
|
||||||
|
if (ANDROID)
|
||||||
|
message(FATAL_ERROR "This project cannot be built on Android.")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
||||||
set(INSTALL_EXAMPLESDIR "examples")
|
set(INSTALL_EXAMPLESDIR "examples")
|
||||||
endif()
|
endif()
|
||||||
|
@ -4,6 +4,10 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
project(pingpong LANGUAGES CXX)
|
project(pingpong LANGUAGES CXX)
|
||||||
|
|
||||||
|
if (ANDROID)
|
||||||
|
message(FATAL_ERROR "This project cannot be built on Android.")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
||||||
set(INSTALL_EXAMPLESDIR "examples")
|
set(INSTALL_EXAMPLESDIR "examples")
|
||||||
endif()
|
endif()
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
if(NOT TARGET Qt6::Network)
|
if(NOT TARGET Qt6::Network)
|
||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
if(NOT INTEGRITY)
|
if(NOT INTEGRITY AND NOT ANDROID)
|
||||||
qt_internal_add_example(dnslookup)
|
qt_internal_add_example(dnslookup)
|
||||||
endif()
|
endif()
|
||||||
if(TARGET Qt6::Widgets)
|
if(TARGET Qt6::Widgets)
|
||||||
|
@ -4,6 +4,10 @@
|
|||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
project(dnslookup LANGUAGES CXX)
|
project(dnslookup LANGUAGES CXX)
|
||||||
|
|
||||||
|
if (ANDROID)
|
||||||
|
message(FATAL_ERROR "This project cannot be built on Android.")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
if(NOT DEFINED INSTALL_EXAMPLESDIR)
|
||||||
set(INSTALL_EXAMPLESDIR "examples")
|
set(INSTALL_EXAMPLESDIR "examples")
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user