Browse Source

Merge pull request #3063 from srcejon/fixes

Update Qt to 6.11.3 on Windows and Mac
chirpmodem-v8.1.0
Edouard Griffiths 2 weeks ago committed by GitHub
parent
commit
596a3ac938
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      .github/workflows/mac.yml
  2. 7
      .github/workflows/sdrangel.yml
  3. 7
      .github/workflows/windows.yml

4
.github/workflows/mac.yml

@ -36,7 +36,7 @@ jobs: @@ -36,7 +36,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.11.2'
version: '6.11.3'
host: 'mac'
arch: 'clang_64'
modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel'
@ -111,7 +111,7 @@ jobs: @@ -111,7 +111,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.11.2'
version: '6.11.3'
host: 'mac'
arch: 'clang_64'
modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel'

7
.github/workflows/sdrangel.yml

@ -27,7 +27,7 @@ jobs: @@ -27,7 +27,7 @@ jobs:
WIN_ARCH: "x64",
os: windows-latest,
QT_INST_DIR: "C:/",
QTDIR: "C:/Qt/6.9.3/msvc2022_64",
QTDIR: "C:/Qt/6.11.3/msvc2022_64",
QT_ARCH: win64_msvc2022_64,
boost_dl: "${{ github.workspace }}\\downloads\\boost",
lib_dir: "C:\\Libraries",
@ -82,7 +82,8 @@ jobs: @@ -82,7 +82,8 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.9.3'
version: '6.11.3'
aqtsource: git+https://github.com/miurahr/aqtinstall.git@076e1659807d0b362a3ed684d54c2e9c775eb9c7
dir: ${{matrix.config.QT_INST_DIR}}
arch: ${{matrix.config.QT_ARCH}}
setup-python: false
@ -93,7 +94,7 @@ jobs: @@ -93,7 +94,7 @@ jobs:
cmd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
choco install patch
mkdir build && cd build
cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.9.3\msvc2022_64;C:\Libraries\boost_1_73_0"
cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.11.3\msvc2022_64;C:\Libraries\boost_1_73_0"
cmake --build . --config Release
cmake --build . --config Release --target package
- name: Check disk space

7
.github/workflows/windows.yml

@ -21,7 +21,7 @@ jobs: @@ -21,7 +21,7 @@ jobs:
WIN_ARCH: "x64",
os: windows-latest,
QT_INST_DIR: "C:/",
QTDIR: "C:/Qt/6.9.3/msvc2022_64",
QTDIR: "C:/Qt/6.11.3/msvc2022_64",
QT_ARCH: win64_msvc2022_64,
boost_dl: "${{ github.workspace }}\\downloads\\boost",
lib_dir: "C:\\Libraries",
@ -76,7 +76,8 @@ jobs: @@ -76,7 +76,8 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.9.3'
version: '6.11.3'
aqtsource: git+https://github.com/miurahr/aqtinstall.git@076e1659807d0b362a3ed684d54c2e9c775eb9c7
dir: ${{matrix.config.QT_INST_DIR}}
arch: ${{matrix.config.QT_ARCH}}
setup-python: 'false'
@ -87,7 +88,7 @@ jobs: @@ -87,7 +88,7 @@ jobs:
cmd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
choco install patch
mkdir build && cd build
cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.9.3\msvc2019_64;C:\Libraries\boost_1_73_0"
cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.11.3\msvc2019_64;C:\Libraries\boost_1_73_0"
cmake --build . --config Release --target package
- name: Check disk space
run: Get-PSDrive

Loading…
Cancel
Save