Skip to content

Commit 158fc80

Browse files
committed
Test
1 parent 7d36cba commit 158fc80

2 files changed

Lines changed: 15 additions & 9 deletions

File tree

.ci/prepare-windows.bat

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
rem Install necessary packages
22
python -m pip install meson
33
vcpkg install pkgconf
4-
vcpkg owns pkgconf
54
vcpkg owns pkgconf.exe
65

7-
dir C:\vcpkg
8-
dir C:\vcpkg\installed
6+
rem dir C:\vcpkg
7+
rem dir C:\vcpkg\installed
98
dir C:\vcpkg\installed\x64-windows
10-
dir C:\vcpkg\packages
11-
dir C:\vcpkg\packages\vcpkg-tool-meson_x64-windows
12-
dir C:\vcpkg\packages\pkgconf_x64-windows
13-
dir C:\vcpkg\scripts\buildsystems
9+
dir C:\vcpkg\installed\x64-windows\bin
10+
dir C:\vcpkg\installed\x64-windows\include
11+
dir C:\vcpkg\installed\x64-windows\lib
12+
dir C:\vcpkg\installed\x64-windows\share
13+
dir C:\vcpkg\installed\x64-windows\tools
14+
rem dir C:\vcpkg\packages
15+
dir C:\vcpkg\packages\vcpkg-tool-meson_x64-windows\share
16+
dir C:\vcpkg\packages\pkgconf_x64-windows\lib
17+
dir C:\vcpkg\packages\pkgconf_x64-windows\share
18+
dir C:\vcpkg\packages\pkgconf_x64-windows\tools
19+
dir C:\vcpkg\scripts\buildsystems\meson
1420

15-
rem vcpkg install expat
21+
vcpkg install expat
1622
rem vcpkg install fftw3
1723
rem vcpkg install freealut
1824
rem vcpkg install freetype

.github/workflows/windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
run: .ci/prepare-windows.bat
1414
- name: Meson Setup
1515
env:
16-
PKG_CONFIG: C:\vcpkg\x64-windows\tools\pkgconf\pkgconf.exe
16+
PKG_CONFIG: C:\vcpkg\installed\x64-windows\tools\pkgconf\pkgconf.exe
1717
run: meson setup --backend vs2022 --buildtype debugoptimized builddir
1818
- name: MSBuild Setup for Meson
1919
uses: microsoft/setup-msbuild@v3

0 commit comments

Comments
 (0)