Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Building with QT6 #1066

Merged
merged 1 commit into from
Oct 23, 2024
Merged

Fix Building with QT6 #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
toolset: 14.1

- name: Install Qt
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
version: ${{ matrix.qt-version }}
host: "windows"
Expand All @@ -158,7 +158,7 @@ jobs:
- name: Configure CMake
run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -B "${{ github.workspace }}/build" ${{ matrix.cmake-args }}
env:
CMAKE_PREFIX_PATH: ${{ env.Qt5_Dir }}
CMAKE_PREFIX_PATH: "${{ env.QT_ROOT_DIR }}/lib/cmake"
WORKSPACE_DIR: ${{ github.workspace }}

- name: Build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ jobs:
pacman --noconfirm -U mingw-w64-x86_64-SDL2-2.30.6-1-any.pkg.tar.zst

- name: Install Qt
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
version: "5.15.2"
host: "windows"
Expand All @@ -170,15 +170,15 @@ jobs:
- name: Configure CMake
run: cmake -DCMAKE_BUILD_TYPE=Release -DCHECK_FOR_UPDATES=ON -DANTIMICROX_PKG_VERSION="GitHub Windows Release" -B '${{ github.workspace }}'/build
env:
CMAKE_PREFIX_PATH: ${{env.Qt5_Dir}}
CMAKE_PREFIX_PATH: "${{ env.QT_ROOT_DIR }}/lib/cmake"

- name: Build Installer
run: cmake --build '${{ github.workspace }}'/build --target package --parallel 8

- name: Configure CMake (portable)
run: cmake -DCMAKE_BUILD_TYPE=Release -DCHECK_FOR_UPDATES=ON -DANTIMICROX_PKG_VERSION="GitHub Portable Windows Release" -DPORTABLE_WIN=ON -B '${{ github.workspace }}'/build
env:
CMAKE_PREFIX_PATH: ${{env.Qt5_Dir}}
CMAKE_PREFIX_PATH: "${{ env.QT_ROOT_DIR }}/lib/cmake"

- name: Build ZIP Package
run: cmake --build '${{ github.workspace }}'/build --target package --parallel 8
Expand Down
Loading