From 41cb814d3d1382ffef39411fd94da215fab2b518 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 26 Oct 2020 17:35:07 +0100 Subject: CMake: Regenerate examples to set the WIN32_EXECUTABLE property As well as the MACOSX_BUNDLE properties as necessary. Task-number: QTBUG-87664 Change-Id: I2e238dff7bdda6c47dfbe28e2a560ee4c25f3d02 Reviewed-by: Joerg Bornemann --- examples/wayland/custom-extension/compositor/CMakeLists.txt | 4 ++++ examples/wayland/custom-extension/cpp-client/CMakeLists.txt | 4 ++++ examples/wayland/custom-extension/qml-client/CMakeLists.txt | 4 ++++ examples/wayland/hwlayer-compositor/CMakeLists.txt | 4 ++++ examples/wayland/ivi-compositor/CMakeLists.txt | 4 ++++ examples/wayland/minimal-cpp/.prev_CMakeLists.txt | 4 ++++ examples/wayland/minimal-cpp/CMakeLists.txt | 4 ++++ examples/wayland/minimal-qml/CMakeLists.txt | 4 ++++ examples/wayland/multi-output/CMakeLists.txt | 4 ++++ examples/wayland/multi-screen/CMakeLists.txt | 4 ++++ examples/wayland/overview-compositor/CMakeLists.txt | 4 ++++ examples/wayland/pure-qml/CMakeLists.txt | 4 ++++ examples/wayland/server-buffer/compositor/CMakeLists.txt | 4 ++++ examples/wayland/server-buffer/cpp-client/CMakeLists.txt | 4 ++++ examples/wayland/server-side-decoration/CMakeLists.txt | 4 ++++ examples/wayland/spanning-screens/CMakeLists.txt | 4 ++++ examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt | 4 ++++ examples/wayland/texture-sharing/qml-client/CMakeLists.txt | 4 ++++ 18 files changed, 72 insertions(+) (limited to 'examples') diff --git a/examples/wayland/custom-extension/compositor/CMakeLists.txt b/examples/wayland/custom-extension/compositor/CMakeLists.txt index 99f88035..de5eafd9 100644 --- a/examples/wayland/custom-extension/compositor/CMakeLists.txt +++ b/examples/wayland/custom-extension/compositor/CMakeLists.txt @@ -29,6 +29,10 @@ qt6_generate_wayland_protocol_server_sources(custom-extension-compositor FILES ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml ) +set_target_properties(custom-extension-compositor PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(custom-extension-compositor PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/custom-extension/cpp-client/CMakeLists.txt b/examples/wayland/custom-extension/cpp-client/CMakeLists.txt index e2afa3cf..3cb61a54 100644 --- a/examples/wayland/custom-extension/cpp-client/CMakeLists.txt +++ b/examples/wayland/custom-extension/cpp-client/CMakeLists.txt @@ -28,6 +28,10 @@ qt6_generate_wayland_protocol_client_sources(custom-extension-cpp-client FILES ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml ) +set_target_properties(custom-extension-cpp-client PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(custom-extension-cpp-client PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/custom-extension/qml-client/CMakeLists.txt b/examples/wayland/custom-extension/qml-client/CMakeLists.txt index 010841e3..7b68ecbc 100644 --- a/examples/wayland/custom-extension/qml-client/CMakeLists.txt +++ b/examples/wayland/custom-extension/qml-client/CMakeLists.txt @@ -30,6 +30,10 @@ qt6_generate_wayland_protocol_client_sources(custom-extension-qml-client FILES ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml ) +set_target_properties(custom-extension-qml-client PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(custom-extension-qml-client PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/hwlayer-compositor/CMakeLists.txt b/examples/wayland/hwlayer-compositor/CMakeLists.txt index 4dfc7969..079a0aa7 100644 --- a/examples/wayland/hwlayer-compositor/CMakeLists.txt +++ b/examples/wayland/hwlayer-compositor/CMakeLists.txt @@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Qml) qt_add_executable(hwlayer-compositor main.cpp ) +set_target_properties(hwlayer-compositor PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(hwlayer-compositor PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/ivi-compositor/CMakeLists.txt b/examples/wayland/ivi-compositor/CMakeLists.txt index b1e5226d..0374c1e4 100644 --- a/examples/wayland/ivi-compositor/CMakeLists.txt +++ b/examples/wayland/ivi-compositor/CMakeLists.txt @@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Qml) qt_add_executable(ivi-compositor main.cpp ) +set_target_properties(ivi-compositor PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(ivi-compositor PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/minimal-cpp/.prev_CMakeLists.txt b/examples/wayland/minimal-cpp/.prev_CMakeLists.txt index 897c8a34..a57b3c7f 100644 --- a/examples/wayland/minimal-cpp/.prev_CMakeLists.txt +++ b/examples/wayland/minimal-cpp/.prev_CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(minimal-cpp main.cpp window.cpp window.h ) +set_target_properties(minimal-cpp PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_include_directories(minimal-cpp PUBLIC ../../include ) diff --git a/examples/wayland/minimal-cpp/CMakeLists.txt b/examples/wayland/minimal-cpp/CMakeLists.txt index 535ec131..cbaa9dc2 100644 --- a/examples/wayland/minimal-cpp/CMakeLists.txt +++ b/examples/wayland/minimal-cpp/CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(minimal-cpp main.cpp window.cpp window.h ) +set_target_properties(minimal-cpp PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_include_directories(minimal-cpp PUBLIC ../../include ) diff --git a/examples/wayland/minimal-qml/CMakeLists.txt b/examples/wayland/minimal-qml/CMakeLists.txt index e7d8359c..f19d3e93 100644 --- a/examples/wayland/minimal-qml/CMakeLists.txt +++ b/examples/wayland/minimal-qml/CMakeLists.txt @@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Qml) qt_add_executable(minimal-qml main.cpp ) +set_target_properties(minimal-qml PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(minimal-qml PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/multi-output/CMakeLists.txt b/examples/wayland/multi-output/CMakeLists.txt index 56274057..2f4019f6 100644 --- a/examples/wayland/multi-output/CMakeLists.txt +++ b/examples/wayland/multi-output/CMakeLists.txt @@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Qml) qt_add_executable(multi-output main.cpp ) +set_target_properties(multi-output PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(multi-output PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/multi-screen/CMakeLists.txt b/examples/wayland/multi-screen/CMakeLists.txt index 4be67cf7..d9c59f3f 100644 --- a/examples/wayland/multi-screen/CMakeLists.txt +++ b/examples/wayland/multi-screen/CMakeLists.txt @@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Qml) qt_add_executable(multi-screen main.cpp ) +set_target_properties(multi-screen PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(multi-screen PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/overview-compositor/CMakeLists.txt b/examples/wayland/overview-compositor/CMakeLists.txt index 28b4a473..7e320702 100644 --- a/examples/wayland/overview-compositor/CMakeLists.txt +++ b/examples/wayland/overview-compositor/CMakeLists.txt @@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Qml) qt_add_executable(overview-compositor main.cpp ) +set_target_properties(overview-compositor PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(overview-compositor PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/pure-qml/CMakeLists.txt b/examples/wayland/pure-qml/CMakeLists.txt index 043f0dec..bda536bf 100644 --- a/examples/wayland/pure-qml/CMakeLists.txt +++ b/examples/wayland/pure-qml/CMakeLists.txt @@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Qml) qt_add_executable(pure-qml main.cpp ) +set_target_properties(pure-qml PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(pure-qml PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/server-buffer/compositor/CMakeLists.txt b/examples/wayland/server-buffer/compositor/CMakeLists.txt index bd0de291..513e73bb 100644 --- a/examples/wayland/server-buffer/compositor/CMakeLists.txt +++ b/examples/wayland/server-buffer/compositor/CMakeLists.txt @@ -29,6 +29,10 @@ qt6_generate_wayland_protocol_server_sources(compositor FILES ${CMAKE_CURRENT_SOURCE_DIR}/../share-buffer.xml ) +set_target_properties(compositor PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(compositor PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/server-buffer/cpp-client/CMakeLists.txt b/examples/wayland/server-buffer/cpp-client/CMakeLists.txt index 03a72f07..438bd3a5 100644 --- a/examples/wayland/server-buffer/cpp-client/CMakeLists.txt +++ b/examples/wayland/server-buffer/cpp-client/CMakeLists.txt @@ -29,6 +29,10 @@ qt6_generate_wayland_protocol_client_sources(server-buffer-cpp-client FILES ${CMAKE_CURRENT_SOURCE_DIR}/../share-buffer.xml ) +set_target_properties(server-buffer-cpp-client PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(server-buffer-cpp-client PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/server-side-decoration/CMakeLists.txt b/examples/wayland/server-side-decoration/CMakeLists.txt index eeb2939d..dc95b805 100644 --- a/examples/wayland/server-side-decoration/CMakeLists.txt +++ b/examples/wayland/server-side-decoration/CMakeLists.txt @@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Qml) qt_add_executable(server-side-decoration main.cpp ) +set_target_properties(server-side-decoration PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(server-side-decoration PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/spanning-screens/CMakeLists.txt b/examples/wayland/spanning-screens/CMakeLists.txt index 01589ae1..c99110b0 100644 --- a/examples/wayland/spanning-screens/CMakeLists.txt +++ b/examples/wayland/spanning-screens/CMakeLists.txt @@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Qml) qt_add_executable(spanning-screens main.cpp ) +set_target_properties(spanning-screens PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(spanning-screens PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt b/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt index eb157a44..0ca81f26 100644 --- a/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt +++ b/examples/wayland/texture-sharing/custom-compositor/CMakeLists.txt @@ -23,6 +23,10 @@ find_package(Qt6 COMPONENTS WaylandCompositor) qt_add_executable(texture-sharing-custom-compositor main.cpp ) +set_target_properties(texture-sharing-custom-compositor PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(texture-sharing-custom-compositor PUBLIC Qt::Core Qt::Gui diff --git a/examples/wayland/texture-sharing/qml-client/CMakeLists.txt b/examples/wayland/texture-sharing/qml-client/CMakeLists.txt index 40a47772..76161a78 100644 --- a/examples/wayland/texture-sharing/qml-client/CMakeLists.txt +++ b/examples/wayland/texture-sharing/qml-client/CMakeLists.txt @@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Quick) qt_add_executable(qml-client main.cpp ) +set_target_properties(qml-client PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(qml-client PUBLIC Qt::Core Qt::Gui -- cgit v1.2.1