1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-21 23:55:13 -05:00

Use Qt 6.8 for Windows build

This commit is contained in:
Jon Beniston 2024-10-20 09:53:25 +01:00
parent 6c617be7db
commit a47c0913b5

View File

@ -24,8 +24,8 @@ jobs:
WIN_ARCH: "x64", WIN_ARCH: "x64",
os: windows-latest, os: windows-latest,
QT_INST_DIR: "C:/", QT_INST_DIR: "C:/",
QTDIR: "C:/Qt/5.15.2/msvc2019_64", QTDIR: "C:/Qt/6.8.0/msvc2022_64",
QT_ARCH: win64_msvc2019_64, QT_ARCH: win64_msvc2022_64,
boost_dl: "${{ github.workspace }}\\downloads\\boost", boost_dl: "${{ github.workspace }}\\downloads\\boost",
lib_dir: "C:\\Libraries", lib_dir: "C:\\Libraries",
generators: Ninja generators: Ninja
@ -69,19 +69,20 @@ jobs:
rm -rf boost_*/* download.tar.bz2 download.tar rm -rf boost_*/* download.tar.bz2 download.tar
shell: bash shell: bash
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v4
with: with:
version: '6.8.0'
dir: ${{matrix.config.QT_INST_DIR}} dir: ${{matrix.config.QT_INST_DIR}}
arch: ${{matrix.config.QT_ARCH}} arch: ${{matrix.config.QT_ARCH}}
setup-python: false setup-python: false
modules: 'qtcharts qtwebengine' modules: 'qtcharts qtwebengine qtstatemachine'
- name: build sdrangel on Windows - name: build sdrangel on Windows
if: startsWith(matrix.config.os, 'windows') if: startsWith(matrix.config.os, 'windows')
run: | run: |
cmd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" cmd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
choco install patch choco install patch
mkdir build && cd build mkdir build && cd build
cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\5.15.2\msvc2019_64;C:\Libraries\boost_1_73_0" cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.8.0\msvc2022_64;C:\Libraries\boost_1_73_0"
cmake --build . --config Release --target package cmake --build . --config Release --target package
- name: Check disk space - name: Check disk space
run: Get-PSDrive run: Get-PSDrive