From 4c8f0b4df6c1f9423219b85ff982c8cae74aa746 Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Tue, 13 May 2025 18:34:50 -0400 Subject: [PATCH 1/6] Add wayland files --- .github/workflows/ci.yml | 2 ++ scwx-qt/scwx-qt.cmake | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 986a5b65..992bb42e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -205,6 +205,8 @@ jobs: cd plugins/ mkdir -p sqldrivers/ cp "${RUNNER_WORKSPACE}/Qt/${{ matrix.qt_version }}/${{ matrix.qt_arch_dir }}/plugins/sqldrivers/libqsqlite.so" sqldrivers/ + mkdir -p platforms/ + cp ${RUNNER_WORKSPACE}/Qt/${{ matrix.qt_version }}/${{ matrix.qt_arch_dir }}/plugins/platforms/libqwayland* platforms/ cd .. popd tar -czf supercell-wx-${{ matrix.artifact_suffix }}.tar.gz supercell-wx/ diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 1628607a..028ee0aa 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -34,6 +34,7 @@ find_package(QT NAMES Qt6 Svg Widgets Sql + WaylandClient REQUIRED) find_package(Qt${QT_VERSION_MAJOR} @@ -48,6 +49,7 @@ find_package(Qt${QT_VERSION_MAJOR} Svg Widgets Sql + WaylandClient REQUIRED) set(SRC_EXE_MAIN source/scwx/qt/main/main.cpp) @@ -696,6 +698,7 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Positioning Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Svg + Qt${QT_VERSION_MAJOR}::WaylandClient Boost::json Boost::timer Boost::atomic From 953975a8511095aae6d3e8d44f5407b76b2f1cec Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Tue, 13 May 2025 18:46:56 -0400 Subject: [PATCH 2/6] add wayland-protocols to ubuntu install --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 992bb42e..aca9ffeb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,6 +126,7 @@ jobs: sudo apt-get install doxygen \ libfuse2 \ ninja-build \ + wayland-protocols \ ${{ matrix.compiler_packages }} - name: Setup Python Environment From fbc135103107d6f598b78472005202d5af34f80d Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Tue, 13 May 2025 18:56:26 -0400 Subject: [PATCH 3/6] Add libwayland to installed apt --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aca9ffeb..ad80a89f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -127,6 +127,8 @@ jobs: libfuse2 \ ninja-build \ wayland-protocols \ + libwayland-dev \ + libwayland-egl-backend-dev \ ${{ matrix.compiler_packages }} - name: Setup Python Environment From b90deae897ac8be52a7b04cc9c289790763f7683 Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Wed, 14 May 2025 17:02:02 -0400 Subject: [PATCH 4/6] Remove unneded WaylandClient libraries --- scwx-qt/scwx-qt.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 028ee0aa..1628607a 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -34,7 +34,6 @@ find_package(QT NAMES Qt6 Svg Widgets Sql - WaylandClient REQUIRED) find_package(Qt${QT_VERSION_MAJOR} @@ -49,7 +48,6 @@ find_package(Qt${QT_VERSION_MAJOR} Svg Widgets Sql - WaylandClient REQUIRED) set(SRC_EXE_MAIN source/scwx/qt/main/main.cpp) @@ -698,7 +696,6 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Positioning Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Svg - Qt${QT_VERSION_MAJOR}::WaylandClient Boost::json Boost::timer Boost::atomic From 4ad3e927305edd2def9c706770a6672796042f04 Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Wed, 14 May 2025 18:19:31 -0400 Subject: [PATCH 5/6] Add wayland client libraries conditionally --- scwx-qt/scwx-qt.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 1628607a..0e8b2ef1 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -688,6 +688,16 @@ if (MSVC) else() target_compile_options(scwx-qt PRIVATE "$<$:-g>") target_compile_options(supercell-wx PRIVATE "$<$:-g>") + + # Add wayland client packages + find_package(QT NAMES Qt6 + COMPONENTS WaylandClient + REQUIRED) + + find_package(Qt${QT_VERSION_MAJOR} + COMPONENTS WaylandClient + REQUIRED) + target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::WaylandClient) endif() target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets From dd76fbf7484975b3d52f59362650132bdd3b10b5 Mon Sep 17 00:00:00 2001 From: AdenKoperczak Date: Wed, 14 May 2025 21:03:52 -0400 Subject: [PATCH 6/6] Add wayland libs to clang tidy review github action --- .github/workflows/clang-tidy-review.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/clang-tidy-review.yml b/.github/workflows/clang-tidy-review.yml index a7ec09ff..2137b451 100644 --- a/.github/workflows/clang-tidy-review.yml +++ b/.github/workflows/clang-tidy-review.yml @@ -65,6 +65,9 @@ jobs: sudo apt-get install doxygen \ libfuse2 \ ninja-build \ + wayland-protocols \ + libwayland-dev \ + libwayland-egl-backend-dev \ ${{ matrix.compiler_packages }} - name: Setup Python Environment