summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-12-14 18:04:56 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-12-15 14:20:18 +0000
commit37ae5f3dde116394d435ca9af361049b299d963e (patch)
tree507afe7dfb9a8619aab8de1524779bb2947c3efb
parentab67f796248581965f6ee021711ff0a4f3291fb9 (diff)
Switch examples to build as isolated sub-builds
Task-number: QTBUG-90820 Change-Id: Id67d82c171c6c2856de5abe911ff5f6931a05580 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit 927bcb3afd4aa3754eabf0a10ab5bd1d666915d5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/remoteobjects/CMakeLists.txt14
-rw-r--r--examples/remoteobjects/simpleswitch/CMakeLists.txt10
-rw-r--r--examples/remoteobjects/ssl/CMakeLists.txt4
-rw-r--r--examples/remoteobjects/websockets/CMakeLists.txt4
4 files changed, 16 insertions, 16 deletions
diff --git a/examples/remoteobjects/CMakeLists.txt b/examples/remoteobjects/CMakeLists.txt
index 6935496..2d6c8dd 100644
--- a/examples/remoteobjects/CMakeLists.txt
+++ b/examples/remoteobjects/CMakeLists.txt
@@ -1,20 +1,20 @@
# Generated from remoteobjects.pro.
-add_subdirectory(remoteobjects_server)
-add_subdirectory(cppclient)
+qt_internal_add_example(remoteobjects_server)
+qt_internal_add_example(cppclient)
add_subdirectory(simpleswitch)
add_subdirectory(websockets)
if(TARGET Qt::Widgets)
- add_subdirectory(modelviewclient)
- add_subdirectory(modelviewserver)
+ qt_internal_add_example(modelviewclient)
+ qt_internal_add_example(modelviewserver)
endif()
if(QT_FEATURE_ssl) # special case
add_subdirectory(ssl)
endif()
if(TARGET Qt::Quick)
- add_subdirectory(plugins)
- add_subdirectory(clientapp)
+ qt_internal_add_example(plugins)
+ qt_internal_add_example(clientapp)
endif()
if(TARGET Qt::Quick AND UNIX AND NOT ANDROID)
- add_subdirectory(qmlmodelviewclient)
+ qt_internal_add_example(qmlmodelviewclient)
endif()
diff --git a/examples/remoteobjects/simpleswitch/CMakeLists.txt b/examples/remoteobjects/simpleswitch/CMakeLists.txt
index a357ec6..8b6456d 100644
--- a/examples/remoteobjects/simpleswitch/CMakeLists.txt
+++ b/examples/remoteobjects/simpleswitch/CMakeLists.txt
@@ -1,7 +1,7 @@
# Generated from simpleswitch.pro.
-add_subdirectory(directconnectclient)
-add_subdirectory(directconnectdynamicclient)
-add_subdirectory(directconnectserver)
-add_subdirectory(registryconnectedclient)
-add_subdirectory(registryconnectedserver)
+qt_internal_add_example(directconnectclient)
+qt_internal_add_example(directconnectdynamicclient)
+qt_internal_add_example(directconnectserver)
+qt_internal_add_example(registryconnectedclient)
+qt_internal_add_example(registryconnectedserver)
diff --git a/examples/remoteobjects/ssl/CMakeLists.txt b/examples/remoteobjects/ssl/CMakeLists.txt
index b77074a..de476f1 100644
--- a/examples/remoteobjects/ssl/CMakeLists.txt
+++ b/examples/remoteobjects/ssl/CMakeLists.txt
@@ -1,4 +1,4 @@
# Generated from ssl.pro.
-add_subdirectory(sslserver)
-add_subdirectory(sslcppclient)
+qt_internal_add_example(sslserver)
+qt_internal_add_example(sslcppclient)
diff --git a/examples/remoteobjects/websockets/CMakeLists.txt b/examples/remoteobjects/websockets/CMakeLists.txt
index fc1c5b1..09ff32c 100644
--- a/examples/remoteobjects/websockets/CMakeLists.txt
+++ b/examples/remoteobjects/websockets/CMakeLists.txt
@@ -1,6 +1,6 @@
# Generated from websockets.pro.
if(TARGET Qt::WebSockets AND TARGET Qt::Widgets)
- add_subdirectory(wsclient)
- add_subdirectory(wsserver)
+ qt_internal_add_example(wsclient)
+ qt_internal_add_example(wsserver)
endif()