diff options
| author | John Fultz <jfultz@wolfram.com> | 2023-07-16 09:27:48 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2023-07-16 09:34:44 -0500 |
| commit | 00c2af7db5c330139f4482dc1d99b45c235d82ec (patch) | |
| tree | 1910aee565b933b7dc3fd86f14a1c3d632556690 /.github/workflows | |
| parent | edbeff498efbcda2fe2e841137f6e038ec94329f (diff) | |
Add Qt6 to cmake, build action matrix.
The cmake file now takes a QT_VERSION string setting. The first
character of the string is “6”, then cmake calls find_package
on Qt6…otherwise, it calls find_package on Qt5.
Qt 6.5.2 builds added to the GitHub Actions build matrix.
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build.yml | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d616e79..aca3acd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: name: [macos-clang, ubuntu-20.04-clang, ubuntu-20.04-g++, ubuntu-22.04-clang, ubuntu-22.04-g++] - qt_ver: [5.12.0, 5.15.2] + qt_ver: [5.12.0, 5.15.2, 6.5.*] include: - name: macos-clang os: macos-latest @@ -43,6 +43,14 @@ jobs: env: CXX: g++ CC: gcc + - name: windows-x64-vs19-qt-6.5.* + qt_ver: 6.5.* + os: windows-latest + msvc_arch: x64 + qt_arch: win64_msvc2019_64 + env: + CXX: cl + C: cl - name: windows-x64-vs19-qt-5.15.1 qt_ver: 5.15.1 os: windows-latest @@ -59,6 +67,14 @@ jobs: env: CXX: cl C: cl + - name: windows-x86-vs19-qt-6.5.* + qt_ver: 6.5.* + os: windows-latest + msvc_arch: x86 + qt_arch: win32_msvc2019 + env: + CXX: cl + C: cl - name: windows-x86-vs19-qt-5.15.1 qt_ver: 5.15.1 os: windows-latest @@ -99,5 +115,5 @@ jobs: run: | mkdir build cd build - cmake -G Ninja ../quacker + cmake -G Ninja -DQT_VERSION=${{ matrix.qt_ver }} ../quacker ninja -v |