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/widgets/tutorials/addressbook/part1/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part2/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part3/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part4/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part5/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part6/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part7/CMakeLists.txt | 3 ++- examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt | 3 ++- examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt | 3 ++- examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt | 3 ++- examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt | 3 ++- examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt | 3 ++- examples/widgets/tutorials/notepad/CMakeLists.txt | 3 ++- examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt | 3 ++- examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt | 3 ++- examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt | 3 ++- examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt | 3 ++- 24 files changed, 48 insertions(+), 24 deletions(-) (limited to 'examples/widgets/tutorials') diff --git a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt index 6c333420f4..07ff78f7d3 100644 --- a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part1 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part1 addressbook.cpp addressbook.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(part1 PUBLIC install(TARGETS part1 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt index 2c5d438bc5..28a3a6a472 100644 --- a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part2 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part2 addressbook.cpp addressbook.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(part2 PUBLIC install(TARGETS part2 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt index 5be04b1e2f..d8d1147306 100644 --- a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part3 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part3 addressbook.cpp addressbook.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(part3 PUBLIC install(TARGETS part3 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt index 309e8eea66..9818a51181 100644 --- a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part4 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part4 addressbook.cpp addressbook.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(part4 PUBLIC install(TARGETS part4 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt index 9d73fd0e96..6ddf50aac7 100644 --- a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part5 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part5 addressbook.cpp addressbook.h finddialog.cpp finddialog.h main.cpp @@ -25,4 +25,5 @@ target_link_libraries(part5 PUBLIC install(TARGETS part5 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt index 015a4cb244..75b7592484 100644 --- a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part6 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part6 addressbook.cpp addressbook.h finddialog.cpp finddialog.h main.cpp @@ -25,4 +25,5 @@ target_link_libraries(part6 PUBLIC install(TARGETS part6 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt index acb3a2903b..5dcb53e470 100644 --- a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part7 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part7 addressbook.cpp addressbook.h finddialog.cpp finddialog.h main.cpp @@ -25,4 +25,5 @@ target_link_libraries(part7 PUBLIC install(TARGETS part7 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt index c148f20a03..739d1384d9 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part1 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part1 main.cpp ) target_link_libraries(part1 PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(part1 PUBLIC install(TARGETS part1 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt index ddbef50ca2..db6bfc8bea 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part2 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part2 main.cpp ) target_link_libraries(part2 PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(part2 PUBLIC install(TARGETS part2 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt index 66cd8827cf..f1cc350d1e 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part3 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part3 main.cpp ) target_link_libraries(part3 PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(part3 PUBLIC install(TARGETS part3 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt index 0c7b9f62f9..bfd358f381 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part4 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part4 main.cpp ) target_link_libraries(part4 PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(part4 PUBLIC install(TARGETS part4 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt index 4fc0df77b7..006b1a6ea5 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(part5 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part5 main.cpp ) target_link_libraries(part5 PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(part5 PUBLIC install(TARGETS part5 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt index ee859409e5..001f6d8070 100644 --- a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(mv_readonly WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_readonly main.cpp mymodel.cpp mymodel.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_readonly PUBLIC install(TARGETS mv_readonly RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt index 75c5f431c1..6b9d5732cf 100644 --- a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(mv_formatting WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_formatting main.cpp mymodel.cpp mymodel.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_formatting PUBLIC install(TARGETS mv_formatting RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt index 60d240f170..52c4ddfc38 100644 --- a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(mv_changingmodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_changingmodel main.cpp mymodel.cpp mymodel.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_changingmodel PUBLIC install(TARGETS mv_changingmodel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt index b719caf8ec..b248a47f57 100644 --- a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(mv_headers WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_headers main.cpp mymodel.cpp mymodel.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_headers PUBLIC install(TARGETS mv_headers RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt index 67c34521f4..d40e8674d8 100644 --- a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(mv_edit WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_edit main.cpp mainwindow.cpp mainwindow.h mymodel.cpp mymodel.h @@ -25,4 +25,5 @@ target_link_libraries(mv_edit PUBLIC install(TARGETS mv_edit RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt index 2feb364569..592f7bb528 100644 --- a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(mv_tree WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_tree main.cpp mainwindow.cpp mainwindow.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_tree PUBLIC install(TARGETS mv_tree RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt index a974313bd7..65b58dfa74 100644 --- a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(mv_selections WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_selections main.cpp mainwindow.cpp mainwindow.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_selections PUBLIC install(TARGETS mv_selections RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/notepad/CMakeLists.txt b/examples/widgets/tutorials/notepad/CMakeLists.txt index 44606d522c..2d1b13e469 100644 --- a/examples/widgets/tutorials/notepad/CMakeLists.txt +++ b/examples/widgets/tutorials/notepad/CMakeLists.txt @@ -14,7 +14,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -add_qt_gui_executable(notepad WIN32 MACOSX_BUNDLE +add_qt_gui_executable(notepad main.cpp notepad.cpp notepad.h notepad.qrc notepad.ui ) @@ -32,4 +32,5 @@ endif() install(TARGETS notepad RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt index b5fb51c77d..f6192757b2 100644 --- a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(childwidget WIN32 MACOSX_BUNDLE +add_qt_gui_executable(childwidget main.cpp ) target_link_libraries(childwidget PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(childwidget PUBLIC install(TARGETS childwidget RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt index e963dd77f3..59f0053c1e 100644 --- a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(nestedlayouts WIN32 MACOSX_BUNDLE +add_qt_gui_executable(nestedlayouts main.cpp ) target_link_libraries(nestedlayouts PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(nestedlayouts PUBLIC install(TARGETS nestedlayouts RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt index b607403c55..033746d0d7 100644 --- a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(toplevel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(toplevel main.cpp ) target_link_libraries(toplevel PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(toplevel PUBLIC install(TARGETS toplevel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt index a9db86bccf..3f3335d9e7 100644 --- a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(windowlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(windowlayout main.cpp ) target_link_libraries(windowlayout PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(windowlayout PUBLIC install(TARGETS windowlayout RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) -- cgit v1.2.3