Skip to content

Commit d009c9a

Browse files
feihongmrbean-bremen
authored andcommitted
update cmake.yml
1 parent 44b1efc commit d009c9a

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,22 @@ jobs:
4444
run: |
4545
if ("${{ matrix.qt_version }}" -eq "5") {
4646
pip install aqtinstall
47-
# aqt install-qt windows desktop 5.15.2 win64_msvc2019 -m all
47+
aqt install-qt windows desktop 5.15.2 win64_msvc2019 -m all
4848
$Qt5Dir = "$env:USERPROFILE\Qt\5.15.2\msvc2019_64"
4949
echo "Qt5Dir=$Qt5Dir" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
5050
echo "$Qt5Dir\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
5151
echo "QTDIR=$Qt5Dir" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
5252
} else {
53-
choco install qt6 --version ${{ matrix.qt_version }}.0.0 --params "/InstallationFolder C:/Qt/${{ matrix.qt_version }}"
53+
choco install -y qt6-base-dev qt6-base-private-dev qt6-5compat-dev qt6-base-dev-tools `
54+
libqt6svg6-dev qt6-multimedia-dev qt6-declarative-dev qt6-webengine-dev `
55+
--params "/InstallationFolder C:/Qt/${{ matrix.qt_version }}"
5456
echo "C:/Qt/${{ matrix.qt_version }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
5557
echo "QTDIR=C:/Qt/${{ matrix.qt_version }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
5658
}
5759
5860
- name: Configure CMake
5961
run: |
60-
cmake -S . -B build \
61-
-DCMAKE_BUILD_TYPE=Release \
62-
-DCMAKE_INSTALL_PREFIX=./install
62+
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install
6363
6464
- name: Build project
6565
run: |

0 commit comments

Comments
 (0)