diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 986a5b65..ad80a89f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,6 +126,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 @@ -205,6 +208,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/.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 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