From ec4f5b2d9672150d3bf400819d7a8024577a1244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 21 Mar 2022 18:46:20 +0100 Subject: Remove .prev_CMakeLists.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.3 Change-Id: Ifa372bef54747f0d933916b31bbd31a269e38a63 Reviewed-by: Jörg Bornemann --- examples/wayland/.prev_CMakeLists.txt | 22 -------- .../compositor/.prev_CMakeLists.txt | 62 --------------------- .../cpp-client/.prev_CMakeLists.txt | 46 ---------------- .../qml-client/.prev_CMakeLists.txt | 63 ---------------------- examples/wayland/minimal-cpp/.prev_CMakeLists.txt | 47 ---------------- .../server-buffer/compositor/.prev_CMakeLists.txt | 62 --------------------- .../server-buffer/cpp-client/.prev_CMakeLists.txt | 48 ----------------- 7 files changed, 350 deletions(-) delete mode 100644 examples/wayland/.prev_CMakeLists.txt delete mode 100644 examples/wayland/custom-extension/compositor/.prev_CMakeLists.txt delete mode 100644 examples/wayland/custom-extension/cpp-client/.prev_CMakeLists.txt delete mode 100644 examples/wayland/custom-extension/qml-client/.prev_CMakeLists.txt delete mode 100644 examples/wayland/minimal-cpp/.prev_CMakeLists.txt delete mode 100644 examples/wayland/server-buffer/compositor/.prev_CMakeLists.txt delete mode 100644 examples/wayland/server-buffer/cpp-client/.prev_CMakeLists.txt diff --git a/examples/wayland/.prev_CMakeLists.txt b/examples/wayland/.prev_CMakeLists.txt deleted file mode 100644 index 400b44128..000000000 --- a/examples/wayland/.prev_CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Generated from wayland.pro. - -if(QT_FEATURE_opengl) - add_subdirectory(minimal-cpp) -endif() -if(TARGET Qt::Quick) - add_subdirectory(minimal-qml) - add_subdirectory(spanning-screens) - add_subdirectory(pure-qml) - add_subdirectory(multi-output) - add_subdirectory(multi-screen) - add_subdirectory(overview-compositor) - add_subdirectory(ivi-compositor) - add_subdirectory(server-side-decoration) - add_subdirectory(hwlayer-compositor) -endif() -if(TARGET Qt::Quick AND TARGET Qt::WaylandClient) - add_subdirectory(custom-extension) -endif() -if(QT_FEATURE_opengl AND TARGET Qt::Quick AND TARGET Qt::WaylandClient) - add_subdirectory(server-buffer) -endif() diff --git a/examples/wayland/custom-extension/compositor/.prev_CMakeLists.txt b/examples/wayland/custom-extension/compositor/.prev_CMakeLists.txt deleted file mode 100644 index de5eafd96..000000000 --- a/examples/wayland/custom-extension/compositor/.prev_CMakeLists.txt +++ /dev/null @@ -1,62 +0,0 @@ -# Generated from compositor.pro. - -cmake_minimum_required(VERSION 3.14) -project(custom-extension-compositor LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/custom-extension/compositor") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS WaylandCompositor) - -qt_add_executable(custom-extension-compositor - customextension.cpp customextension.h - main.cpp -) - -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 - Qt::Qml - Qt::WaylandCompositor -) - - -# Resources: -set(compositor_resource_files - "images/background.png" - "qml/CompositorScreen.qml" - "qml/main.qml" -) - -qt6_add_resources(custom-extension-compositor "compositor" - PREFIX - "/" - FILES - ${compositor_resource_files} -) - -install(TARGETS custom-extension-compositor - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/wayland/custom-extension/cpp-client/.prev_CMakeLists.txt b/examples/wayland/custom-extension/cpp-client/.prev_CMakeLists.txt deleted file mode 100644 index 3cb61a54d..000000000 --- a/examples/wayland/custom-extension/cpp-client/.prev_CMakeLists.txt +++ /dev/null @@ -1,46 +0,0 @@ -# Generated from cpp-client.pro. - -cmake_minimum_required(VERSION 3.14) -project(custom-extension-cpp-client LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/custom-extension/cpp-client") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WaylandClient) - -qt_add_executable(custom-extension-cpp-client - ../client-common/customextension.cpp ../client-common/customextension.h - main.cpp -) - -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 - Qt::GuiPrivate - Qt::WaylandClient -) - -install(TARGETS custom-extension-cpp-client - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/wayland/custom-extension/qml-client/.prev_CMakeLists.txt b/examples/wayland/custom-extension/qml-client/.prev_CMakeLists.txt deleted file mode 100644 index 7b68ecbc1..000000000 --- a/examples/wayland/custom-extension/qml-client/.prev_CMakeLists.txt +++ /dev/null @@ -1,63 +0,0 @@ -# Generated from qml-client.pro. - -cmake_minimum_required(VERSION 3.14) -project(custom-extension-qml-client LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/custom-extension/qml-client") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS WaylandClient) - -qt_add_executable(custom-extension-qml-client - ../client-common/customextension.cpp ../client-common/customextension.h - main.cpp -) - -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 - Qt::GuiPrivate - Qt::Qml - Qt::Quick - Qt::WaylandClient -) - - -# Resources: -set(qml_resource_files - "main.qml" -) - -qt6_add_resources(custom-extension-qml-client "qml" - PREFIX - "/" - FILES - ${qml_resource_files} -) - -install(TARGETS custom-extension-qml-client - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/wayland/minimal-cpp/.prev_CMakeLists.txt b/examples/wayland/minimal-cpp/.prev_CMakeLists.txt deleted file mode 100644 index a57b3c7f5..000000000 --- a/examples/wayland/minimal-cpp/.prev_CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ -# Generated from minimal-cpp.pro. - -cmake_minimum_required(VERSION 3.14) -project(minimal-cpp LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/minimal-cpp") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WaylandCompositor) - -qt_add_executable(minimal-cpp - compositor.cpp compositor.h - 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 -) - -target_link_libraries(minimal-cpp PUBLIC - # Remove: L - ../../lib - Qt::Core - Qt::Gui - Qt::WaylandCompositor -) - -install(TARGETS minimal-cpp - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/wayland/server-buffer/compositor/.prev_CMakeLists.txt b/examples/wayland/server-buffer/compositor/.prev_CMakeLists.txt deleted file mode 100644 index 513e73bb0..000000000 --- a/examples/wayland/server-buffer/compositor/.prev_CMakeLists.txt +++ /dev/null @@ -1,62 +0,0 @@ -# Generated from compositor.pro. - -cmake_minimum_required(VERSION 3.14) -project(compositor LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/server-buffer/compositor") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Qml) -find_package(Qt6 COMPONENTS WaylandCompositor) - -qt_add_executable(compositor - main.cpp - sharebufferextension.cpp sharebufferextension.h -) - -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 - Qt::Qml - Qt::WaylandCompositorPrivate -) - - -# Resources: -set(compositor_resource_files - "images/Siberischer_tiger_de_edit02.jpg" - "images/background.png" - "qml/main.qml" -) - -qt6_add_resources(compositor "compositor" - PREFIX - "/" - FILES - ${compositor_resource_files} -) - -install(TARGETS compositor - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/wayland/server-buffer/cpp-client/.prev_CMakeLists.txt b/examples/wayland/server-buffer/cpp-client/.prev_CMakeLists.txt deleted file mode 100644 index 438bd3a5e..000000000 --- a/examples/wayland/server-buffer/cpp-client/.prev_CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ -# Generated from cpp-client.pro. - -cmake_minimum_required(VERSION 3.14) -project(server-buffer-cpp-client LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/server-buffer/cpp-client") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS WaylandClient) -find_package(Qt6 COMPONENTS OpenGL) - -qt_add_executable(server-buffer-cpp-client - main.cpp - sharebufferextension.cpp sharebufferextension.h -) - -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 - Qt::GuiPrivate - Qt::OpenGL - Qt::WaylandClientPrivate -) - -install(TARGETS server-buffer-cpp-client - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) -- cgit v1.2.3