diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-09-22 13:51:31 +0300 |
---|---|---|
committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-09-22 18:24:37 +0300 |
commit | 1c8a2dbcd8ae26209cfed2fce288e6511d8c3f72 (patch) | |
tree | 50c5ee1f4e935625e54b4a9be999bff555633672 /examples | |
parent | c931241cdac1f908300dd27b82d9bf4ffdbecc41 (diff) |
Exclude example from Android and iOS the right way
Don't add_subdirectory(devices) for Android and iOS, instead
of throwing a warning.
Pick-to: 6.2
Change-Id: Iaa4300d3ad875557f11504f80d0224d72debe2f9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/multimedia/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/multimedia/devices/CMakeLists.txt | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/examples/multimedia/CMakeLists.txt b/examples/multimedia/CMakeLists.txt index ab7280862..3ae1d06e9 100644 --- a/examples/multimedia/CMakeLists.txt +++ b/examples/multimedia/CMakeLists.txt @@ -1,7 +1,9 @@ # Generated from multimedia.pro. add_subdirectory(audiodecoder) -add_subdirectory(devices) +if(NOT ANDROID AND NOT IOS) + add_subdirectory(devices) +endif() if(TARGET Qt::Widgets) add_subdirectory(spectrum) add_subdirectory(audiorecorder) diff --git a/examples/multimedia/devices/CMakeLists.txt b/examples/multimedia/devices/CMakeLists.txt index 2727c1a75..d75b4f23f 100644 --- a/examples/multimedia/devices/CMakeLists.txt +++ b/examples/multimedia/devices/CMakeLists.txt @@ -9,11 +9,6 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -if(ANDROID OR IOS) - message(WARNING "This is a commandline tool that is not supported on mobile platforms") - return() -endif() - if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() |