diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-02-02 16:47:50 +0100 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-02-15 15:01:47 +0100 |
commit | 1cc323065faa3285dda5a6b3f9314b498016a8f9 (patch) | |
tree | cec37c3f9556f8e8a331756a3a1635669e5eeccd /examples | |
parent | 11f4d90f6040d8b24c45512d9e618753a703be0c (diff) |
Regenerate CMake projects
Task-number: QTBUG-90686
Change-Id: I721eb88e638c83916884b7e7cf56dfa379baba86
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Diffstat (limited to 'examples')
16 files changed, 79 insertions, 15 deletions
diff --git a/examples/remoteobjects/clientapp/CMakeLists.txt b/examples/remoteobjects/clientapp/CMakeLists.txt index 3431885..d184774 100644 --- a/examples/remoteobjects/clientapp/CMakeLists.txt +++ b/examples/remoteobjects/clientapp/CMakeLists.txt @@ -20,9 +20,13 @@ find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS Quick) -add_qt_gui_executable(clientapp +qt_add_executable(clientapp main.cpp ) +set_target_properties(clientapp PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(clientapp PUBLIC Qt::Core Qt::Gui diff --git a/examples/remoteobjects/cppclient/CMakeLists.txt b/examples/remoteobjects/cppclient/CMakeLists.txt index f6dd299..d12fe7e 100644 --- a/examples/remoteobjects/cppclient/CMakeLists.txt +++ b/examples/remoteobjects/cppclient/CMakeLists.txt @@ -18,9 +18,13 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/cppclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(CppClient +qt_add_executable(CppClient main.cpp ) +set_target_properties(CppClient PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) target_link_libraries(CppClient PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/modelviewclient/CMakeLists.txt b/examples/remoteobjects/modelviewclient/CMakeLists.txt index cda7293..79b792a 100644 --- a/examples/remoteobjects/modelviewclient/CMakeLists.txt +++ b/examples/remoteobjects/modelviewclient/CMakeLists.txt @@ -20,9 +20,13 @@ find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(modelviewclient +qt_add_executable(modelviewclient main.cpp ) +set_target_properties(modelviewclient PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) target_link_libraries(modelviewclient PUBLIC Qt::Core Qt::Gui diff --git a/examples/remoteobjects/modelviewserver/CMakeLists.txt b/examples/remoteobjects/modelviewserver/CMakeLists.txt index 6471a35..b8402eb 100644 --- a/examples/remoteobjects/modelviewserver/CMakeLists.txt +++ b/examples/remoteobjects/modelviewserver/CMakeLists.txt @@ -20,9 +20,13 @@ find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS RemoteObjects) -add_qt_gui_executable(modelviewserver +qt_add_executable(modelviewserver main.cpp ) +set_target_properties(modelviewserver PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(modelviewserver PUBLIC Qt::Core Qt::Gui diff --git a/examples/remoteobjects/plugins/CMakeLists.txt b/examples/remoteobjects/plugins/CMakeLists.txt index ff0c5f4..ee689d2 100644 --- a/examples/remoteobjects/plugins/CMakeLists.txt +++ b/examples/remoteobjects/plugins/CMakeLists.txt @@ -30,6 +30,10 @@ qt6_add_qml_module(qmlqtimeexampleplugin target_sources(qmlqtimeexampleplugin PRIVATE plugin.cpp ) +set_target_properties(qmlqtimeexampleplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(qmlqtimeexampleplugin PUBLIC Qt::Core Qt::Gui diff --git a/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt b/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt index c03320a..584f3e5 100644 --- a/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt +++ b/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt @@ -21,9 +21,13 @@ find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) find_package(Qt6 COMPONENTS RemoteObjects) -add_qt_gui_executable(qmlmodelviewclient +qt_add_executable(qmlmodelviewclient main.cpp ) +set_target_properties(qmlmodelviewclient PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(qmlmodelviewclient PUBLIC Qt::Core Qt::Gui diff --git a/examples/remoteobjects/server/CMakeLists.txt b/examples/remoteobjects/server/CMakeLists.txt index 53506c7..dad4381 100644 --- a/examples/remoteobjects/server/CMakeLists.txt +++ b/examples/remoteobjects/server/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/server") find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS Core) -add_executable(server +qt_add_executable(server main.cpp timemodel.cpp timemodel.h ) +set_target_properties(server PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE TRUE +) target_link_libraries(server PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt index bbdedd9..d99d5fc 100644 --- a/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/direct find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(directconnectclient +qt_add_executable(directconnectclient client.cpp client.h main.cpp ) +set_target_properties(directconnectclient PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(directconnectclient PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt index 8818c42..d13d06b 100644 --- a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/direct find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(directconnectdynamicclient +qt_add_executable(directconnectdynamicclient dynamicclient.cpp dynamicclient.h main.cpp ) +set_target_properties(directconnectdynamicclient PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(directconnectdynamicclient PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt index 63aa555..f64b03c 100644 --- a/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/direct find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(directconnectserver +qt_add_executable(directconnectserver main.cpp simpleswitch.cpp simpleswitch.h ) +set_target_properties(directconnectserver PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(directconnectserver PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt index 258c569..7a70caf 100644 --- a/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/regist find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(registryconnectedclient +qt_add_executable(registryconnectedclient dynamicclient.cpp dynamicclient.h main.cpp ) +set_target_properties(registryconnectedclient PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(registryconnectedclient PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt b/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt index 74747da..0746cd6 100644 --- a/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt +++ b/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt @@ -18,10 +18,14 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/regist find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS RemoteObjects) -add_executable(registryconnectedserver +qt_add_executable(registryconnectedserver main.cpp simpleswitch.cpp simpleswitch.h ) +set_target_properties(registryconnectedserver PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) target_link_libraries(registryconnectedserver PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt index d6fbe8e..c634398 100644 --- a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt +++ b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt @@ -18,9 +18,13 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/ssl/sslcppclient") find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS Core) -add_executable(SslCppClient +qt_add_executable(SslCppClient main.cpp ) +set_target_properties(SslCppClient PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) target_link_libraries(SslCppClient PUBLIC # Remove: gui Qt::Core diff --git a/examples/remoteobjects/ssl/sslserver/CMakeLists.txt b/examples/remoteobjects/ssl/sslserver/CMakeLists.txt index 117bf5a..3ba15d9 100644 --- a/examples/remoteobjects/ssl/sslserver/CMakeLists.txt +++ b/examples/remoteobjects/ssl/sslserver/CMakeLists.txt @@ -18,11 +18,15 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/ssl/sslserver") find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS Core) -add_executable(sslserver +qt_add_executable(sslserver main.cpp sslserver.cpp sslserver.h timemodel.cpp timemodel.h ) +set_target_properties(sslserver PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE TRUE +) target_link_libraries(sslserver PUBLIC Qt::Core Qt::RemoteObjects diff --git a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt index d733be6..52287d0 100644 --- a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt +++ b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt @@ -21,10 +21,14 @@ find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS WebSockets) -add_executable(wsclient +qt_add_executable(wsclient ../common/websocketiodevice.cpp ../common/websocketiodevice.h main.cpp ) +set_target_properties(wsclient PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) target_include_directories(wsclient PUBLIC ../common ) diff --git a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt index d1fe00d..b896388 100644 --- a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt +++ b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt @@ -21,10 +21,14 @@ find_package(Qt6 COMPONENTS Widgets) find_package(Qt6 COMPONENTS RemoteObjects) find_package(Qt6 COMPONENTS WebSockets) -add_executable(wsserver +qt_add_executable(wsserver ../common/websocketiodevice.cpp ../common/websocketiodevice.h main.cpp ) +set_target_properties(wsserver PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) target_include_directories(wsserver PUBLIC ../common ) |