From efa9998521cb061051fe8b75d0df3206d0b32ec5 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 12 Jun 2019 10:21:40 +0200 Subject: Fix compiling of examples on Android * Simplify add_qt_gui_executable() to not require WIN32/MACOSX_BUNDLE but provide it implicitly. It's redundant :) * When on Android, build a module (shared library), just like qmake. This requires an additional library destination in the install() call, but that's ignored on other platforms. * Fix typos in the android deployment generation settings function * Use the correct cache variable to determine whether we're inside a Qt build or not. Right now this only works inside Qt builds anyway as QtPlatformAndroid.cmake is not publically accessible. Change-Id: If1c763c31a7a83d0e0d854362ba7901657f63eb5 Reviewed-by: Alexandru Croitor Reviewed-by: Qt CMake Build Bot --- examples/network/bearermonitor/CMakeLists.txt | 1 + examples/network/blockingfortuneclient/CMakeLists.txt | 3 ++- examples/network/broadcastreceiver/CMakeLists.txt | 3 ++- examples/network/broadcastsender/CMakeLists.txt | 3 ++- examples/network/dnslookup/CMakeLists.txt | 1 + examples/network/download/CMakeLists.txt | 1 + examples/network/downloadmanager/CMakeLists.txt | 1 + examples/network/fortuneclient/CMakeLists.txt | 3 ++- examples/network/fortuneserver/CMakeLists.txt | 3 ++- examples/network/googlesuggest/CMakeLists.txt | 3 ++- examples/network/http/CMakeLists.txt | 3 ++- examples/network/loopback/CMakeLists.txt | 3 ++- examples/network/multicastreceiver/CMakeLists.txt | 3 ++- examples/network/multicastsender/CMakeLists.txt | 3 ++- examples/network/multistreamclient/CMakeLists.txt | 3 ++- examples/network/multistreamserver/CMakeLists.txt | 3 ++- examples/network/network-chat/CMakeLists.txt | 3 ++- examples/network/securesocketclient/CMakeLists.txt | 3 ++- examples/network/secureudpclient/CMakeLists.txt | 3 ++- examples/network/secureudpserver/CMakeLists.txt | 3 ++- examples/network/threadedfortuneserver/CMakeLists.txt | 3 ++- examples/network/torrent/.prev_CMakeLists.txt | 2 +- examples/network/torrent/CMakeLists.txt | 3 ++- 23 files changed, 41 insertions(+), 19 deletions(-) (limited to 'examples/network') diff --git a/examples/network/bearermonitor/CMakeLists.txt b/examples/network/bearermonitor/CMakeLists.txt index 55893a7138..8cb67e13b6 100644 --- a/examples/network/bearermonitor/CMakeLists.txt +++ b/examples/network/bearermonitor/CMakeLists.txt @@ -33,4 +33,5 @@ target_link_libraries(bearermonitor PUBLIC install(TARGETS bearermonitor RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/blockingfortuneclient/CMakeLists.txt b/examples/network/blockingfortuneclient/CMakeLists.txt index 47933d66ff..f79e15cb59 100644 --- a/examples/network/blockingfortuneclient/CMakeLists.txt +++ b/examples/network/blockingfortuneclient/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(blockingfortuneclient WIN32 MACOSX_BUNDLE +add_qt_gui_executable(blockingfortuneclient blockingclient.cpp blockingclient.h fortunethread.cpp fortunethread.h main.cpp @@ -27,4 +27,5 @@ target_link_libraries(blockingfortuneclient PUBLIC install(TARGETS blockingfortuneclient RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/broadcastreceiver/CMakeLists.txt b/examples/network/broadcastreceiver/CMakeLists.txt index d8cdae0b42..05074f6d91 100644 --- a/examples/network/broadcastreceiver/CMakeLists.txt +++ b/examples/network/broadcastreceiver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(broadcastreceiver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(broadcastreceiver main.cpp receiver.cpp receiver.h ) @@ -26,4 +26,5 @@ target_link_libraries(broadcastreceiver PUBLIC install(TARGETS broadcastreceiver RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/broadcastsender/CMakeLists.txt b/examples/network/broadcastsender/CMakeLists.txt index 31681c29c3..323ea5e9cb 100644 --- a/examples/network/broadcastsender/CMakeLists.txt +++ b/examples/network/broadcastsender/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(broadcastsender WIN32 MACOSX_BUNDLE +add_qt_gui_executable(broadcastsender main.cpp sender.cpp sender.h ) @@ -26,4 +26,5 @@ target_link_libraries(broadcastsender PUBLIC install(TARGETS broadcastsender RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/dnslookup/CMakeLists.txt b/examples/network/dnslookup/CMakeLists.txt index 8aa5bea4cb..b79445370b 100644 --- a/examples/network/dnslookup/CMakeLists.txt +++ b/examples/network/dnslookup/CMakeLists.txt @@ -25,4 +25,5 @@ target_link_libraries(dnslookup PUBLIC install(TARGETS dnslookup RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/download/CMakeLists.txt b/examples/network/download/CMakeLists.txt index 0ec20216b5..2b48217c38 100644 --- a/examples/network/download/CMakeLists.txt +++ b/examples/network/download/CMakeLists.txt @@ -25,4 +25,5 @@ target_link_libraries(download PUBLIC install(TARGETS download RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/downloadmanager/CMakeLists.txt b/examples/network/downloadmanager/CMakeLists.txt index 574073c7eb..b8eb8db400 100644 --- a/examples/network/downloadmanager/CMakeLists.txt +++ b/examples/network/downloadmanager/CMakeLists.txt @@ -27,4 +27,5 @@ target_link_libraries(downloadmanager PUBLIC install(TARGETS downloadmanager RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/fortuneclient/CMakeLists.txt b/examples/network/fortuneclient/CMakeLists.txt index 6530cdcf00..0169b4eb4c 100644 --- a/examples/network/fortuneclient/CMakeLists.txt +++ b/examples/network/fortuneclient/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(fortuneclient WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fortuneclient client.cpp client.h main.cpp ) @@ -26,4 +26,5 @@ target_link_libraries(fortuneclient PUBLIC install(TARGETS fortuneclient RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/fortuneserver/CMakeLists.txt b/examples/network/fortuneserver/CMakeLists.txt index 43ca6f7d2b..fb2a681413 100644 --- a/examples/network/fortuneserver/CMakeLists.txt +++ b/examples/network/fortuneserver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(fortuneserver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fortuneserver main.cpp server.cpp server.h ) @@ -26,4 +26,5 @@ target_link_libraries(fortuneserver PUBLIC install(TARGETS fortuneserver RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/googlesuggest/CMakeLists.txt b/examples/network/googlesuggest/CMakeLists.txt index b1556de464..f0f7f14378 100644 --- a/examples/network/googlesuggest/CMakeLists.txt +++ b/examples/network/googlesuggest/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(googlesuggest WIN32 MACOSX_BUNDLE +add_qt_gui_executable(googlesuggest googlesuggest.cpp googlesuggest.h main.cpp searchbox.cpp searchbox.h @@ -27,4 +27,5 @@ target_link_libraries(googlesuggest PUBLIC install(TARGETS googlesuggest RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/http/CMakeLists.txt b/examples/network/http/CMakeLists.txt index 3da3b8c3ac..890f2891a2 100644 --- a/examples/network/http/CMakeLists.txt +++ b/examples/network/http/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(http WIN32 MACOSX_BUNDLE +add_qt_gui_executable(http authenticationdialog.ui httpwindow.cpp httpwindow.h main.cpp @@ -27,4 +27,5 @@ target_link_libraries(http PUBLIC install(TARGETS http RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/loopback/CMakeLists.txt b/examples/network/loopback/CMakeLists.txt index e6f46b0933..4e4e265edd 100644 --- a/examples/network/loopback/CMakeLists.txt +++ b/examples/network/loopback/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(loopback WIN32 MACOSX_BUNDLE +add_qt_gui_executable(loopback dialog.cpp dialog.h main.cpp ) @@ -26,4 +26,5 @@ target_link_libraries(loopback PUBLIC install(TARGETS loopback RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/multicastreceiver/CMakeLists.txt b/examples/network/multicastreceiver/CMakeLists.txt index eaabf8a5d5..19a062aff3 100644 --- a/examples/network/multicastreceiver/CMakeLists.txt +++ b/examples/network/multicastreceiver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(multicastreceiver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(multicastreceiver main.cpp receiver.cpp receiver.h ) @@ -26,4 +26,5 @@ target_link_libraries(multicastreceiver PUBLIC install(TARGETS multicastreceiver RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/multicastsender/CMakeLists.txt b/examples/network/multicastsender/CMakeLists.txt index 8504bc3647..ba4386963e 100644 --- a/examples/network/multicastsender/CMakeLists.txt +++ b/examples/network/multicastsender/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(multicastsender WIN32 MACOSX_BUNDLE +add_qt_gui_executable(multicastsender main.cpp sender.cpp sender.h ) @@ -26,4 +26,5 @@ target_link_libraries(multicastsender PUBLIC install(TARGETS multicastsender RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/multistreamclient/CMakeLists.txt b/examples/network/multistreamclient/CMakeLists.txt index c0091d1046..efb4c7bf35 100644 --- a/examples/network/multistreamclient/CMakeLists.txt +++ b/examples/network/multistreamclient/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(multistreamclient WIN32 MACOSX_BUNDLE +add_qt_gui_executable(multistreamclient chatconsumer.cpp chatconsumer.h client.cpp client.h consumer.h @@ -30,4 +30,5 @@ target_link_libraries(multistreamclient PUBLIC install(TARGETS multistreamclient RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/multistreamserver/CMakeLists.txt b/examples/network/multistreamserver/CMakeLists.txt index 44c36e4322..88aefc9af0 100644 --- a/examples/network/multistreamserver/CMakeLists.txt +++ b/examples/network/multistreamserver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(multistreamserver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(multistreamserver chatprovider.cpp chatprovider.h main.cpp movieprovider.cpp movieprovider.h @@ -30,4 +30,5 @@ target_link_libraries(multistreamserver PUBLIC install(TARGETS multistreamserver RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/network-chat/CMakeLists.txt b/examples/network/network-chat/CMakeLists.txt index be60e01f14..c3cbf32d9f 100644 --- a/examples/network/network-chat/CMakeLists.txt +++ b/examples/network/network-chat/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(network-chat WIN32 MACOSX_BUNDLE +add_qt_gui_executable(network-chat chatdialog.cpp chatdialog.h chatdialog.ui client.cpp client.h connection.cpp connection.h @@ -30,4 +30,5 @@ target_link_libraries(network-chat PUBLIC install(TARGETS network-chat RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/securesocketclient/CMakeLists.txt b/examples/network/securesocketclient/CMakeLists.txt index f00d138d80..d514d21508 100644 --- a/examples/network/securesocketclient/CMakeLists.txt +++ b/examples/network/securesocketclient/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(securesocketclient WIN32 MACOSX_BUNDLE +add_qt_gui_executable(securesocketclient certificateinfo.cpp certificateinfo.h certificateinfo.ui main.cpp securesocketclient.qrc @@ -29,4 +29,5 @@ target_link_libraries(securesocketclient PUBLIC install(TARGETS securesocketclient RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/secureudpclient/CMakeLists.txt b/examples/network/secureudpclient/CMakeLists.txt index 6af110c412..08854bd334 100644 --- a/examples/network/secureudpclient/CMakeLists.txt +++ b/examples/network/secureudpclient/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Network) -add_qt_gui_executable(secureudpclient WIN32 MACOSX_BUNDLE +add_qt_gui_executable(secureudpclient addressdialog.cpp addressdialog.h addressdialog.ui association.cpp association.h main.cpp @@ -28,4 +28,5 @@ target_link_libraries(secureudpclient PUBLIC install(TARGETS secureudpclient RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/secureudpserver/CMakeLists.txt b/examples/network/secureudpserver/CMakeLists.txt index f30d880800..e991c9822c 100644 --- a/examples/network/secureudpserver/CMakeLists.txt +++ b/examples/network/secureudpserver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Network) -add_qt_gui_executable(secureudpserver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(secureudpserver main.cpp mainwindow.cpp mainwindow.h mainwindow.ui nicselector.cpp nicselector.h nicselector.ui @@ -28,4 +28,5 @@ target_link_libraries(secureudpserver PUBLIC install(TARGETS secureudpserver RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/threadedfortuneserver/CMakeLists.txt b/examples/network/threadedfortuneserver/CMakeLists.txt index ce5c0e0d19..4e5f61ceca 100644 --- a/examples/network/threadedfortuneserver/CMakeLists.txt +++ b/examples/network/threadedfortuneserver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(threadedfortuneserver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(threadedfortuneserver dialog.cpp dialog.h fortuneserver.cpp fortuneserver.h fortunethread.cpp fortunethread.h @@ -28,4 +28,5 @@ target_link_libraries(threadedfortuneserver PUBLIC install(TARGETS threadedfortuneserver RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/network/torrent/.prev_CMakeLists.txt b/examples/network/torrent/.prev_CMakeLists.txt index 3673b7e05a..3ed78c7e3b 100644 --- a/examples/network/torrent/.prev_CMakeLists.txt +++ b/examples/network/torrent/.prev_CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(torrent WIN32 MACOSX_BUNDLE +add_qt_gui_executable(torrent addtorrentdialog.cpp addtorrentdialog.h bencodeparser.cpp bencodeparser.h connectionmanager.cpp connectionmanager.h diff --git a/examples/network/torrent/CMakeLists.txt b/examples/network/torrent/CMakeLists.txt index 86bad72ab7..205b1b4527 100644 --- a/examples/network/torrent/CMakeLists.txt +++ b/examples/network/torrent/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(torrent WIN32 MACOSX_BUNDLE +add_qt_gui_executable(torrent addtorrentdialog.cpp addtorrentdialog.h bencodeparser.cpp bencodeparser.h connectionmanager.cpp connectionmanager.h @@ -39,4 +39,5 @@ target_link_libraries(torrent PUBLIC install(TARGETS torrent RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) -- cgit v1.2.3