diff --git a/.github/windows_native_file.txt b/.github/windows_native_file.txt new file mode 100644 index 000000000..6db2a6792 --- /dev/null +++ b/.github/windows_native_file.txt @@ -0,0 +1,4 @@ +[binaries] +c = 'cl.exe' +cpp = 'cl.exe' +pkg-config = 'pykg-config.exe' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e50099a8a..3ec0ab888 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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