Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update vcpkg #2199

Merged
merged 2 commits into from
Jun 7, 2024
Merged

Update vcpkg #2199

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bad3d35
Update vcpkg
ajtribick Jun 6, 2024
a09a222
Switch Windows build to ENABLE_WIN_ICU, remove icu from qtbase features
ajtribick Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Update vcpkg
shell: pwsh
run: |
$vcpkgCommit = '326d8b43e365352ba3ccadf388d989082fe0f2a6'
$vcpkgCommit = '6e31ee33cc9fc93599c4ceb38e229098cf339bb7'
pushd "$env:VCPKG_INSTALLATION_ROOT"
git cat-file -e "${vcpkgCommit}^{commit}" 2> $null
if (!$?) {
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
'boost-smart-ptr',
'cspice',
'eigen3',
'ffmpeg[x264]',
'ffmpeg[core,avcodec,avformat,gpl,swscale,x264]',
'fmt',
'freetype',
'gettext[tools]',
Expand All @@ -75,7 +75,7 @@ jobs:
'libjpeg-turbo',
'libpng',
'luajit',
'qtbase[core,opengl,widgets,freetype,harfbuzz,icu,jpeg,png]'
'qtbase[core,opengl,widgets,freetype,harfbuzz,jpeg,png]'
)

# We treat x86 builds as native, other builds keep host as x64-windows.
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
-DENABLE_MINIAUDIO=ON `
-DENABLE_LTO=ON `
-DUSE_ICU=ON `
-DUSE_WIN_ICU=OFF
-DUSE_WIN_ICU=ON

- name: Build
shell: pwsh
Expand Down
Loading