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 <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
2019-06-12 10:21:40 +02:00 · 2019-06-12 10:21:40 +02:00 · efa9998521
commit efa9998521
parent 6732fa3a29
240 changed files with 471 additions and 229 deletions
--- a/cmake/QtPlatformAndroid.cmake
+++ b/cmake/QtPlatformAndroid.cmake
@ -17,8 +17,8 @@
 #
 # Public functions:
 #
-#   qt_android_generate_depolyment_settings()
-#       Generate the depolyment settings json file for a cmake target.
+#   qt_android_generate_deployment_settings()
+#       Generate the deployment settings json file for a cmake target.
 #

 if (NOT DEFINED ANDROID_SDK_ROOT)
@ -133,7 +133,7 @@ define_property(TARGET
 )

 # Generate deployment tool json
-function(qt_android_generate_depolyment_settings target)
+function(qt_android_generate_deployment_settings target)
    # Information extracted from mkspecs/features/android/android_deployment_settings.prf
    if (NOT TARGET ${target})
        message(SEND_ERROR "${target} is not a cmake target")
@ -143,7 +143,7 @@ function(qt_android_generate_depolyment_settings target)
    get_target_property(target_type ${target} TYPE)

    if (NOT "${target_type}" STREQUAL "MODULE_LIBRARY")
-        message(SEND_ERROR "QT_ANDROID_GENERATE_DEPOLYMENT_SETTINGS only works on Module targets")
+        message(SEND_ERROR "QT_ANDROID_GENERATE_DEPLOYMENT_SETTINGS only works on Module targets")
        return()
    endif()

@ -161,10 +161,10 @@ function(qt_android_generate_depolyment_settings target)
        "   \"description\": \"This file is generated by cmake to be read by androiddeployqt and should not be modified by hand.\",\n")

    # Host Qt Android  install path
-    if (NOT QT_BUILD_QT)
+    if (NOT QT_BUILDING_QT)
        set(file_check "${Qt5_DIR}/plugins/platforms/android/libqtforandroid.so")
        if (NOT EXISTS ${file_check})
-            message(SEND_ERROR "Detected Qt installation does not containt libqtforandroid.so. This is most likely due to the installation not being a build of Qt for Android. Please update your settings.")
+            message(SEND_ERROR "Detected Qt installation does not contain libqtforandroid.so. This is most likely due to the installation not being a build of Qt for Android. Please update your settings.")
            return()
        endif()
        set(qt_android_install_dir ${Qt5_Dir})
--- a/examples/corelib/ipc/localfortuneclient/CMakeLists.txt
+++ b/examples/corelib/ipc/localfortuneclient/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Network)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(localfortuneclient WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(localfortuneclient
    client.cpp client.h
    main.cpp
 )
@ -25,4 +25,5 @@ target_link_libraries(localfortuneclient PUBLIC
 install(TARGETS localfortuneclient
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/ipc/localfortuneserver/CMakeLists.txt
+++ b/examples/corelib/ipc/localfortuneserver/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Network)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(localfortuneserver WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(localfortuneserver
    main.cpp
    server.cpp server.h
 )
@ -25,4 +25,5 @@ target_link_libraries(localfortuneserver PUBLIC
 install(TARGETS localfortuneserver
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/ipc/sharedmemory/CMakeLists.txt
+++ b/examples/corelib/ipc/sharedmemory/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(sharedmemory WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(sharedmemory
    dialog.cpp dialog.h dialog.ui
    main.cpp
 )
@ -23,4 +23,5 @@ target_link_libraries(sharedmemory PUBLIC
 install(TARGETS sharedmemory
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt
+++ b/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(mimetypebrowser WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(mimetypebrowser
    main.cpp
    mainwindow.cpp mainwindow.h
    mimetypemodel.cpp mimetypemodel.h
@ -24,4 +24,5 @@ target_link_libraries(mimetypebrowser PUBLIC
 install(TARGETS mimetypebrowser
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/serialization/cbordump/CMakeLists.txt
+++ b/examples/corelib/serialization/cbordump/CMakeLists.txt
@ -23,4 +23,5 @@ target_link_libraries(cbordump PUBLIC
 install(TARGETS cbordump
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/serialization/convert/CMakeLists.txt
+++ b/examples/corelib/serialization/convert/CMakeLists.txt
@ -30,4 +30,5 @@ target_link_libraries(convert PUBLIC
 install(TARGETS convert
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/serialization/savegame/CMakeLists.txt
+++ b/examples/corelib/serialization/savegame/CMakeLists.txt
@ -26,4 +26,5 @@ target_link_libraries(savegame PUBLIC
 install(TARGETS savegame
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/threads/mandelbrot/CMakeLists.txt
+++ b/examples/corelib/threads/mandelbrot/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(mandelbrot WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(mandelbrot
    main.cpp
    mandelbrotwidget.cpp mandelbrotwidget.h
    renderthread.cpp renderthread.h
@ -24,4 +24,5 @@ target_link_libraries(mandelbrot PUBLIC
 install(TARGETS mandelbrot
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/threads/queuedcustomtype/CMakeLists.txt
+++ b/examples/corelib/threads/queuedcustomtype/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(queuedcustomtype WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(queuedcustomtype
    block.cpp block.h
    main.cpp
    renderthread.cpp renderthread.h
@ -25,4 +25,5 @@ target_link_libraries(queuedcustomtype PUBLIC
 install(TARGETS queuedcustomtype
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/threads/semaphores/CMakeLists.txt
+++ b/examples/corelib/threads/semaphores/CMakeLists.txt
@ -22,4 +22,5 @@ target_link_libraries(semaphores PUBLIC
 install(TARGETS semaphores
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/threads/waitconditions/CMakeLists.txt
+++ b/examples/corelib/threads/waitconditions/CMakeLists.txt
@ -22,4 +22,5 @@ target_link_libraries(waitconditions PUBLIC
 install(TARGETS waitconditions
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/tools/contiguouscache/CMakeLists.txt
+++ b/examples/corelib/tools/contiguouscache/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(contiguouscache WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(contiguouscache
    main.cpp
    randomlistmodel.cpp randomlistmodel.h
 )
@ -23,4 +23,5 @@ target_link_libraries(contiguouscache PUBLIC
 install(TARGETS contiguouscache
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/tools/customtype/CMakeLists.txt
+++ b/examples/corelib/tools/customtype/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(customtype WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(customtype
    main.cpp
    message.cpp message.h
 )
@ -23,4 +23,5 @@ target_link_libraries(customtype PUBLIC
 install(TARGETS customtype
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/corelib/tools/customtypesending/CMakeLists.txt
+++ b/examples/corelib/tools/customtypesending/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(customtypesending WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(customtypesending
    main.cpp
    message.cpp message.h
    window.cpp window.h
@ -24,4 +24,5 @@ target_link_libraries(customtypesending PUBLIC
 install(TARGETS customtypesending
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/dbus/chat/CMakeLists.txt
+++ b/examples/dbus/chat/CMakeLists.txt
@ -27,7 +27,7 @@ qt5_add_dbus_adaptor(chat_SRCS
    chat_adaptor
 )
 # special case end
-add_qt_gui_executable(chat WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(chat
    chat.cpp chat.h
    chatmainwindow.ui
    chatsetnickname.ui
@ -40,4 +40,5 @@ target_link_libraries(chat PUBLIC
 install(TARGETS chat
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/dbus/complexpingpong/CMakeLists.txt
+++ b/examples/dbus/complexpingpong/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS DBus)

-add_qt_gui_executable(complexpong WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(complexpong
    complexpong.cpp complexpong.h
 )
 target_link_libraries(complexpong PUBLIC
@ -23,4 +23,5 @@ target_link_libraries(complexpong PUBLIC
 install(TARGETS complexpong
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/dbus/listnames/CMakeLists.txt
+++ b/examples/dbus/listnames/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS DBus)

-add_qt_gui_executable(listnames WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(listnames
    listnames.cpp
 )
 target_link_libraries(listnames PUBLIC
@ -23,4 +23,5 @@ target_link_libraries(listnames PUBLIC
 install(TARGETS listnames
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/dbus/pingpong/CMakeLists.txt
+++ b/examples/dbus/pingpong/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS DBus)

-add_qt_gui_executable(pong WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(pong
    ping-common.h
    pong.cpp pong.h
 )
@ -24,4 +24,5 @@ target_link_libraries(pong PUBLIC
 install(TARGETS pong
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt
+++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt
@ -23,7 +23,7 @@ qt5_add_dbus_adaptor(car_SRCS
    car_adaptor
 )
 # special case end
-add_qt_gui_executable(car WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(car
    car.cpp car.h
    main.cpp
    ${car_SRCS} # special case
@ -35,4 +35,5 @@ target_link_libraries(car PUBLIC
 install(TARGETS car
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
+++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
@ -21,7 +21,7 @@ qt5_add_dbus_interface(controller_SRCS
    car_interface
 )
 # special case end
-add_qt_gui_executable(controller WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(controller
    controller.cpp controller.h controller.ui
    main.cpp
    ${controller_SRCS} # special case
@ -33,4 +33,5 @@ target_link_libraries(controller PUBLIC
 install(TARGETS controller
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/embedded/digiflip/CMakeLists.txt
+++ b/examples/embedded/digiflip/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(digiflip WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(digiflip
    digiflip.cpp
 )
 target_link_libraries(digiflip PUBLIC
@ -22,4 +22,5 @@ target_link_libraries(digiflip PUBLIC
 install(TARGETS digiflip
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/embedded/flickable/CMakeLists.txt
+++ b/examples/embedded/flickable/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(flickable WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(flickable
    flickable.cpp flickable.h
    main.cpp
 )
@ -23,4 +23,5 @@ target_link_libraries(flickable PUBLIC
 install(TARGETS flickable
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/embedded/flightinfo/CMakeLists.txt
+++ b/examples/embedded/flightinfo/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Network)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(flightinfo WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(flightinfo
    flightinfo.cpp
    form.ui
    flightinfo.qrc # special case: add
@ -26,4 +26,5 @@ target_link_libraries(flightinfo PUBLIC
 install(TARGETS flightinfo
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/embedded/lightmaps/CMakeLists.txt
+++ b/examples/embedded/lightmaps/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Network)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(lightmaps WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(lightmaps
    lightmaps.cpp lightmaps.h
    main.cpp
    mapzoom.cpp mapzoom.h
@ -27,4 +27,5 @@ target_link_libraries(lightmaps PUBLIC
 install(TARGETS lightmaps
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/embedded/raycasting/CMakeLists.txt
+++ b/examples/embedded/raycasting/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(raycasting WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(raycasting
    raycasting.cpp raycasting.qrc
 )
 target_link_libraries(raycasting PUBLIC
@ -23,4 +23,5 @@ target_link_libraries(raycasting PUBLIC
 install(TARGETS raycasting
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/embedded/styleexample/CMakeLists.txt
+++ b/examples/embedded/styleexample/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(styleexample WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(styleexample
    main.cpp
    stylewidget.cpp stylewidget.h stylewidget.ui
    styleexample.qrc # special case: add
@ -24,4 +24,5 @@ target_link_libraries(styleexample PUBLIC
 install(TARGETS styleexample
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/gui/analogclock/CMakeLists.txt
+++ b/examples/gui/analogclock/CMakeLists.txt
@ -13,7 +13,7 @@ set(CMAKE_AUTOUIC ON)

 set(INSTALL_EXAMPLEDIR "examples")

-add_qt_gui_executable(gui_analogclock WIN32 MACOSX_BUNDLE # special case: renamed target
+add_qt_gui_executable(gui_analogclock # special case: renamed target
    ../rasterwindow/rasterwindow.cpp ../rasterwindow/rasterwindow.h
    main.cpp
 )
@ -29,4 +29,5 @@ target_link_libraries(gui_analogclock PUBLIC
 install(TARGETS gui_analogclock
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/gui/openglwindow/CMakeLists.txt
+++ b/examples/gui/openglwindow/CMakeLists.txt
@ -13,7 +13,7 @@ set(CMAKE_AUTOUIC ON)

 set(INSTALL_EXAMPLEDIR "examples")

-add_qt_gui_executable(openglwindow WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(openglwindow
    main.cpp
    openglwindow.cpp openglwindow.h
 )
@ -28,4 +28,5 @@ target_link_libraries(openglwindow PUBLIC
 install(TARGETS openglwindow
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/gui/rasterwindow/CMakeLists.txt
+++ b/examples/gui/rasterwindow/CMakeLists.txt
@ -13,7 +13,7 @@ set(CMAKE_AUTOUIC ON)

 set(INSTALL_EXAMPLEDIR "examples")

-add_qt_gui_executable(rasterwindow WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(rasterwindow
    main.cpp
    rasterwindow.cpp rasterwindow.h
 )
@ -28,4 +28,5 @@ target_link_libraries(rasterwindow PUBLIC
 install(TARGETS rasterwindow
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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}"
 )
--- 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
--- 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}"
 )
--- a/examples/qpa/qrasterwindow/CMakeLists.txt
+++ b/examples/qpa/qrasterwindow/CMakeLists.txt
@ -13,7 +13,7 @@ set(CMAKE_AUTOUIC ON)

 set(INSTALL_EXAMPLEDIR "examples")

-add_qt_gui_executable(qrasterwindow WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(qrasterwindow
    main.cpp
 )
 target_link_libraries(qrasterwindow PUBLIC Qt::Gui) # special case: add
@ -21,4 +21,5 @@ target_link_libraries(qrasterwindow PUBLIC Qt::Gui) # special case: add
 install(TARGETS qrasterwindow
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qpa/windows/CMakeLists.txt
+++ b/examples/qpa/windows/CMakeLists.txt
@ -30,4 +30,5 @@ target_link_libraries(windows PUBLIC
 install(TARGETS windows
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qtconcurrent/imagescaling/CMakeLists.txt
+++ b/examples/qtconcurrent/imagescaling/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Concurrent)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(imagescaling WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(imagescaling
    imagescaling.cpp imagescaling.h
    main.cpp
 )
@ -26,4 +26,5 @@ target_link_libraries(imagescaling PUBLIC
 install(TARGETS imagescaling
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qtconcurrent/map/CMakeLists.txt
+++ b/examples/qtconcurrent/map/CMakeLists.txt
@ -24,4 +24,5 @@ target_link_libraries(mapdemo PUBLIC
 install(TARGETS mapdemo
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qtconcurrent/progressdialog/CMakeLists.txt
+++ b/examples/qtconcurrent/progressdialog/CMakeLists.txt
@ -25,4 +25,5 @@ target_link_libraries(progressdialog PUBLIC
 install(TARGETS progressdialog
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qtconcurrent/runfunction/CMakeLists.txt
+++ b/examples/qtconcurrent/runfunction/CMakeLists.txt
@ -25,4 +25,5 @@ target_link_libraries(runfunction PUBLIC
 install(TARGETS runfunction
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qtconcurrent/wordcount/CMakeLists.txt
+++ b/examples/qtconcurrent/wordcount/CMakeLists.txt
@ -25,4 +25,5 @@ target_link_libraries(wordcount PUBLIC
 install(TARGETS wordcount
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qtestlib/tutorial1/CMakeLists.txt
+++ b/examples/qtestlib/tutorial1/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Widgets)
 find_package(Qt5 COMPONENTS Test)

-add_qt_gui_executable(tutorial1 WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(tutorial1
    testqstring.cpp
 )
 target_link_libraries(tutorial1 PUBLIC
@ -24,4 +24,5 @@ target_link_libraries(tutorial1 PUBLIC
 install(TARGETS tutorial1
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qtestlib/tutorial2/CMakeLists.txt
+++ b/examples/qtestlib/tutorial2/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Widgets)
 find_package(Qt5 COMPONENTS Test)

-add_qt_gui_executable(tutorial2 WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(tutorial2
    testqstring.cpp
 )
 target_link_libraries(tutorial2 PUBLIC
@ -24,4 +24,5 @@ target_link_libraries(tutorial2 PUBLIC
 install(TARGETS tutorial2
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qtestlib/tutorial3/CMakeLists.txt
+++ b/examples/qtestlib/tutorial3/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Widgets)
 find_package(Qt5 COMPONENTS Test)

-add_qt_gui_executable(tutorial3 WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(tutorial3
    testgui.cpp
 )
 target_link_libraries(tutorial3 PUBLIC
@ -24,4 +24,5 @@ target_link_libraries(tutorial3 PUBLIC
 install(TARGETS tutorial3
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qtestlib/tutorial4/CMakeLists.txt
+++ b/examples/qtestlib/tutorial4/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Widgets)
 find_package(Qt5 COMPONENTS Test)

-add_qt_gui_executable(tutorial4 WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(tutorial4
    testgui.cpp
 )
 target_link_libraries(tutorial4 PUBLIC
@ -24,4 +24,5 @@ target_link_libraries(tutorial4 PUBLIC
 install(TARGETS tutorial4
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/qtestlib/tutorial5/CMakeLists.txt
+++ b/examples/qtestlib/tutorial5/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Widgets)
 find_package(Qt5 COMPONENTS Test)

-add_qt_gui_executable(tutorial5 WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(tutorial5
    benchmarking.cpp
 )
 target_link_libraries(tutorial5 PUBLIC
@ -24,4 +24,5 @@ target_link_libraries(tutorial5 PUBLIC
 install(TARGETS tutorial5
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/sql/books/CMakeLists.txt
+++ b/examples/sql/books/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Sql)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(books WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(books
    bookdelegate.cpp bookdelegate.h
    books.qrc
    bookwindow.cpp bookwindow.h bookwindow.ui
@ -32,4 +32,5 @@ target_link_libraries(books PUBLIC
 install(TARGETS books
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/sql/cachedtable/CMakeLists.txt
+++ b/examples/sql/cachedtable/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Sql)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(cachedtable WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(cachedtable
    ../connection.h
    main.cpp
    tableeditor.cpp tableeditor.h
@ -27,4 +27,5 @@ target_link_libraries(cachedtable PUBLIC
 install(TARGETS cachedtable
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/sql/drilldown/CMakeLists.txt
+++ b/examples/sql/drilldown/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Sql)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(drilldown WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(drilldown
    ../connection.h
    drilldown.qrc
    imageitem.cpp imageitem.h
@ -30,4 +30,5 @@ target_link_libraries(drilldown PUBLIC
 install(TARGETS drilldown
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/sql/masterdetail/CMakeLists.txt
+++ b/examples/sql/masterdetail/CMakeLists.txt
@ -15,7 +15,7 @@ find_package(Qt5 COMPONENTS Sql)
 find_package(Qt5 COMPONENTS Widgets)
 find_package(Qt5 COMPONENTS Xml)

-add_qt_gui_executable(masterdetail WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(masterdetail
    database.h
    dialog.cpp dialog.h
    main.cpp
@ -31,4 +31,5 @@ target_link_libraries(masterdetail PUBLIC
 install(TARGETS masterdetail
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/sql/querymodel/CMakeLists.txt
+++ b/examples/sql/querymodel/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Sql)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(querymodel WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(querymodel
    ../connection.h
    customsqlmodel.cpp customsqlmodel.h
    editablesqlmodel.cpp editablesqlmodel.h
@ -28,4 +28,5 @@ target_link_libraries(querymodel PUBLIC
 install(TARGETS querymodel
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/sql/relationaltablemodel/CMakeLists.txt
+++ b/examples/sql/relationaltablemodel/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Sql)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(relationaltablemodel WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(relationaltablemodel
    ../connection.h
    relationaltablemodel.cpp
 )
@ -26,4 +26,5 @@ target_link_libraries(relationaltablemodel PUBLIC
 install(TARGETS relationaltablemodel
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/sql/sqlbrowser/CMakeLists.txt
+++ b/examples/sql/sqlbrowser/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Sql)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(sqlbrowser WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(sqlbrowser
    browser.cpp browser.h
    browserwidget.ui
    connectionwidget.cpp connectionwidget.h
@ -29,4 +29,5 @@ target_link_libraries(sqlbrowser PUBLIC
 install(TARGETS sqlbrowser
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/sql/sqlwidgetmapper/CMakeLists.txt
+++ b/examples/sql/sqlwidgetmapper/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Sql)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(sqlwidgetmapper WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(sqlwidgetmapper
    main.cpp
    window.cpp window.h
 )
@ -26,4 +26,5 @@ target_link_libraries(sqlwidgetmapper PUBLIC
 install(TARGETS sqlwidgetmapper
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/sql/tablemodel/CMakeLists.txt
+++ b/examples/sql/tablemodel/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Sql)
 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(tablemodel WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(tablemodel
    ../connection.h
    tablemodel.cpp
 )
@ -26,4 +26,5 @@ target_link_libraries(tablemodel PUBLIC
 install(TARGETS tablemodel
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/animation/animatedtiles/CMakeLists.txt
+++ b/examples/widgets/animation/animatedtiles/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(animatedtiles WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(animatedtiles
    animatedtiles.qrc
    main.cpp
 )
@ -24,4 +24,5 @@ target_link_libraries(animatedtiles PUBLIC
 install(TARGETS animatedtiles
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/animation/easing/CMakeLists.txt
+++ b/examples/widgets/animation/easing/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(easing WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(easing
    animation.h
    easing.qrc
    form.ui
@ -27,4 +27,5 @@ target_link_libraries(easing PUBLIC
 install(TARGETS easing
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/animation/moveblocks/CMakeLists.txt
+++ b/examples/widgets/animation/moveblocks/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(moveblocks WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(moveblocks
    main.cpp
 )
 target_link_libraries(moveblocks PUBLIC
@ -23,4 +23,5 @@ target_link_libraries(moveblocks PUBLIC
 install(TARGETS moveblocks
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/animation/states/CMakeLists.txt
+++ b/examples/widgets/animation/states/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(states WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(states
    main.cpp
    states.qrc
 )
@ -24,4 +24,5 @@ target_link_libraries(states PUBLIC
 install(TARGETS states
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/animation/stickman/CMakeLists.txt
+++ b/examples/widgets/animation/stickman/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(stickman WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(stickman
    animation.cpp animation.h
    graphicsview.cpp graphicsview.h
    lifecycle.cpp lifecycle.h
@ -29,4 +29,5 @@ target_link_libraries(stickman PUBLIC
 install(TARGETS stickman
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/animation/sub-attaq/CMakeLists.txt
+++ b/examples/widgets/animation/sub-attaq/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Widgets)
 find_package(Qt5 COMPONENTS OpenGL) # special case

-add_qt_gui_executable(sub-attaq WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(sub-attaq
    animationmanager.cpp animationmanager.h
    boat.cpp boat.h boat_p.h
    bomb.cpp bomb.h
@ -40,4 +40,5 @@ endif()
 install(TARGETS sub-attaq
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/desktop/screenshot/CMakeLists.txt
+++ b/examples/widgets/desktop/screenshot/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(screenshot WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(screenshot
    main.cpp
    screenshot.cpp screenshot.h
 )
@ -24,4 +24,5 @@ target_link_libraries(screenshot PUBLIC
 install(TARGETS screenshot
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/desktop/systray/CMakeLists.txt
+++ b/examples/widgets/desktop/systray/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(systray WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(systray
    main.cpp
    systray.qrc
    window.cpp window.h
@ -25,4 +25,5 @@ target_link_libraries(systray PUBLIC
 install(TARGETS systray
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/dialogs/classwizard/CMakeLists.txt
+++ b/examples/widgets/dialogs/classwizard/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(classwizard WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(classwizard
    classwizard.cpp classwizard.h classwizard.qrc
    main.cpp
 )
@ -24,4 +24,5 @@ target_link_libraries(classwizard PUBLIC
 install(TARGETS classwizard
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/dialogs/extension/CMakeLists.txt
+++ b/examples/widgets/dialogs/extension/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(extension WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(extension
    finddialog.cpp finddialog.h
    main.cpp
 )
@ -24,4 +24,5 @@ target_link_libraries(extension PUBLIC
 install(TARGETS extension
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/dialogs/findfiles/CMakeLists.txt
+++ b/examples/widgets/dialogs/findfiles/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(findfiles WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(findfiles
    main.cpp
    window.cpp window.h
 )
@ -24,4 +24,5 @@ target_link_libraries(findfiles PUBLIC
 install(TARGETS findfiles
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/dialogs/licensewizard/CMakeLists.txt
+++ b/examples/widgets/dialogs/licensewizard/CMakeLists.txt
@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples")
 find_package(Qt5 COMPONENTS Widgets)
 find_package(Qt5 COMPONENTS PrintSupport)

-add_qt_gui_executable(licensewizard WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(licensewizard
    licensewizard.cpp licensewizard.h licensewizard.qrc
    main.cpp
 )
@ -26,4 +26,5 @@ target_link_libraries(licensewizard PUBLIC
 install(TARGETS licensewizard
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt
+++ b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(standarddialogs WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(standarddialogs
    dialog.cpp dialog.h
    main.cpp
 )
@ -24,4 +24,5 @@ target_link_libraries(standarddialogs PUBLIC
 install(TARGETS standarddialogs
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/dialogs/tabdialog/CMakeLists.txt
+++ b/examples/widgets/dialogs/tabdialog/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(tabdialog WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(tabdialog
    main.cpp
    tabdialog.cpp tabdialog.h
 )
@ -24,4 +24,5 @@ target_link_libraries(tabdialog PUBLIC
 install(TARGETS tabdialog
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt
+++ b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(trivialwizard WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(trivialwizard
    trivialwizard.cpp
 )
 target_link_libraries(trivialwizard PUBLIC
@ -23,4 +23,5 @@ target_link_libraries(trivialwizard PUBLIC
 install(TARGETS trivialwizard
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt
+++ b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(draggableicons WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(draggableicons
    draggableicons.qrc
    dragwidget.cpp dragwidget.h
    main.cpp
@ -25,4 +25,5 @@ target_link_libraries(draggableicons PUBLIC
 install(TARGETS draggableicons
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt
+++ b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(draggabletext WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(draggabletext
    draggabletext.qrc
    dragwidget.cpp dragwidget.h
    main.cpp
@ -25,4 +25,5 @@ target_link_libraries(draggabletext PUBLIC
 install(TARGETS draggabletext
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/draganddrop/dropsite/CMakeLists.txt
+++ b/examples/widgets/draganddrop/dropsite/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(dropsite WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(dropsite
    droparea.cpp droparea.h
    dropsitewindow.cpp dropsitewindow.h
    main.cpp
@ -25,4 +25,5 @@ target_link_libraries(dropsite PUBLIC
 install(TARGETS dropsite
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt
+++ b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(fridgemagnets WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(fridgemagnets
    draglabel.cpp draglabel.h
    dragwidget.cpp dragwidget.h
    fridgemagnets.qrc
@ -26,4 +26,5 @@ target_link_libraries(fridgemagnets PUBLIC
 install(TARGETS fridgemagnets
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/draganddrop/puzzle/CMakeLists.txt
+++ b/examples/widgets/draganddrop/puzzle/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(draganddrop_puzzle WIN32 MACOSX_BUNDLE # special case: renamed puzzle
+add_qt_gui_executable(draganddrop_puzzle # special case: renamed puzzle
    main.cpp
    mainwindow.cpp mainwindow.h
    pieceslist.cpp pieceslist.h
@ -27,4 +27,5 @@ target_link_libraries(draganddrop_puzzle PUBLIC # special case: renamed puzzle
 install(TARGETS draganddrop_puzzle # special case: renamed puzzle
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/effects/blurpicker/CMakeLists.txt
+++ b/examples/widgets/effects/blurpicker/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(blurpicker WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(blurpicker
    blureffect.cpp blureffect.h
    blurpicker.cpp blurpicker.h blurpicker.qrc
    main.cpp
@ -25,4 +25,5 @@ target_link_libraries(blurpicker PUBLIC
 install(TARGETS blurpicker
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/effects/fademessage/CMakeLists.txt
+++ b/examples/widgets/effects/fademessage/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(fademessage WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(fademessage
    fademessage.cpp fademessage.h fademessage.qrc
    main.cpp
 )
@ -24,4 +24,5 @@ target_link_libraries(fademessage PUBLIC
 install(TARGETS fademessage
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/gestures/imagegestures/CMakeLists.txt
+++ b/examples/widgets/gestures/imagegestures/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(imagegestures WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(imagegestures
    imagewidget.cpp imagewidget.h
    main.cpp
    mainwidget.cpp mainwidget.h
@ -25,4 +25,5 @@ target_link_libraries(imagegestures PUBLIC
 install(TARGETS imagegestures
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt
+++ b/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(anchorlayout WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(anchorlayout
    main.cpp
 )
 target_link_libraries(anchorlayout PUBLIC
@ -23,4 +23,5 @@ target_link_libraries(anchorlayout PUBLIC
 install(TARGETS anchorlayout
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt
+++ b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt
@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples")

 find_package(Qt5 COMPONENTS Widgets)

-add_qt_gui_executable(basicgraphicslayouts WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(basicgraphicslayouts
    basicgraphicslayouts.qrc
    layoutitem.cpp layoutitem.h
    main.cpp
@ -26,4 +26,5 @@ target_link_libraries(basicgraphicslayouts PUBLIC
 install(TARGETS basicgraphicslayouts
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/examples/widgets/graphicsview/boxes/CMakeLists.txt
+++ b/examples/widgets/graphicsview/boxes/CMakeLists.txt
@ -15,7 +15,7 @@ find_package(Qt5 COMPONENTS OpenGL)
 find_package(Qt5 COMPONENTS Widgets)


-add_qt_gui_executable(boxes WIN32 MACOSX_BUNDLE
+add_qt_gui_executable(boxes
    3rdparty/fbm.c 3rdparty/fbm.h
    boxes.qrc
    glbuffers.cpp glbuffers.h
@ -35,4 +35,5 @@ target_link_libraries(boxes PUBLIC
 install(TARGETS boxes
    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
--- a/Show More
+++ b/Show More