Skip to content

Commit

Permalink
Use a native_file.txt to set our binaries on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
mgautierfr committed Dec 5, 2023
1 parent 84d80dc commit 3772438
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .github/windows_native_file.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[binaries]
c = 'cl.exe'
cpp = 'cl.exe'
pkg-config = 'pykg-config.exe'
13 changes: 6 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
choco install ninja

- name: Install python modules
run: pip3 install meson pykg-config
run: pip3 install meson git+https://github.com/mgautierfr/pykg-config.git

- name: Setup MSVC compiler
uses: bus1/cabuild/action/msdevshell@v1
Expand All @@ -102,20 +102,19 @@ jobs:
shell: bash
run: |
which meson.exe
cp /c/hostedtoolcache/windows/Python/3.10.11/x64/Scripts/pykg-config.py /c/hostedtoolcache/windows/Python/3.10.11/x64/Scripts/pkg-config
ls /c/hostedtoolcache/windows/Python/3.10.11/x64/Scripts
#cp /c/hostedtoolcache/windows/Python/3.10.11/x64/Scripts/pykg-config.py /c/hostedtoolcache/windows/Python/3.10.11/x64/Scripts/pkg-config
#chmod a+x /c/hostedtoolcache/windows/Python/3.10.11/x64/Scripts/pkg-config
ls -l /c/hostedtoolcache/windows/Python/3.10.11/x64/Scripts/
echo $PATH
#cat /c/hostedtoolcache/windows/Python/3.10.11/x64/Scripts/pkg-config.bat
#ls -l /c/hostedtoolcache/windows/Python/3.10.11/x64/Scripts/
pykg-config.exe --version
- name: Compile
env:
PKG_CONFIG_PATH: BUILD_native_mixed\INSTALL\lib\pkgconfig;BUILD_native_static\INSTALL\lib\pkgconfig
CC: cl.exe
CXX: cl.exe
PATH: C:\hostedtoolcache\windows\Python\3.10.11\x64\Scripts
run: |
meson.exe setup build . -Ddefault_library=static
meson.exe setup build . -Ddefault_library=static --native-file .github\\windows_native_file.txt
type build/meson-logs/meson-log.txt
meson.exe compile -C build --verbose
Expand Down

0 comments on commit 3772438

Please sign in to comment.