@@ -32,16 +32,28 @@ jobs:
3232 sudo apt-get install -y qtbase5-dev qtbase5-private-dev qtchooser qt5-qmake qtbase5-dev-tools \
3333 libqt5svg5-dev qttools5-dev libqt5xmlpatterns5-dev qtmultimedia5-dev qtdeclarative5-dev \
3434 qtwebengine5-dev libqt5webkit5-dev
35+ echo "QTDIR=/usr/lib/x86_64-linux-gnu/qt5" | tee -a $GITHUB_ENV
3536 else
3637 sudo apt-get install -y qt6-base-dev qt6-base-private-dev qt6-5compat-dev qt6-base-dev-tools \
3738 libqt6svg6-dev qt6-multimedia-dev qt6-declarative-dev qt6-webengine-dev
39+ echo "QTDIR=/usr/lib/x86_64-linux-gnu/qt6" | tee -a $GITHUB_ENV
3840 fi
3941
4042 - name : Install dependencies (Windows)
4143 if : runner.os == 'Windows'
4244 run : |
43- choco install qt${{ matrix.qt_version }} --version ${{ matrix.qt_version }}.0.0 --params "/InstallationFolder C:/Qt/${{ matrix.qt_version }}"
44- echo "C:/Qt/${{ matrix.qt_version }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
45+ if ("${{ matrix.qt_version }}" -eq "5") {
46+ pip install aqtinstall
47+ aqt install-qt windows desktop ${{ matrix.qt_version }}.15.2 win64_msvc2019 -m qtbase qtmultimedia qtdeclarative qttools qtsvg
48+ $Qt5Dir = "$env:USERPROFILE\Qt\${{ matrix.qt_version }}.15.2\msvc2019_64"
49+ echo "Qt5Dir=$Qt5Dir" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
50+ echo "$Qt5Dir\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
51+ echo "QTDIR=$Qt5Dir" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
52+ } else {
53+ choco install qt6 --version ${{ matrix.qt_version }}.0.0 --params "/InstallationFolder C:/Qt/${{ matrix.qt_version }}"
54+ echo "C:/Qt/${{ matrix.qt_version }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
55+ echo "QTDIR=C:/Qt/${{ matrix.qt_version }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
56+ }
4557
4658 - name : Configure CMake
4759 run : |
5668 - name : Run tests
5769 run : |
5870 cd build
59- ctest --output-on-failure
71+ ctest --output-on-failure
0 commit comments