diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml index 2b45a59f..a2f214dd 100644 --- a/.github/workflows/buildwheel.yml +++ b/.github/workflows/buildwheel.yml @@ -36,14 +36,6 @@ jobs: - run: choco install -y --stoponfirstfailure --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite if: ${{ startsWith( matrix.os , 'windows' ) }} - # We have to set this here rather than in the cibuildwheel config - # This is probably something to do with \ vs / in paths... - - run: | - $pkgConfigPath = "${{ github.workspace }}/.local/lib/pkgconfig" - $pkgConfigPath = $pkgConfigPath.Replace('\', '/') - echo "PKG_CONFIG_PATH=$pkgConfigPath" >> $env:GITHUB_ENV - if: ${{ startsWith( matrix.os , 'windows' ) }} - - name: Build wheels uses: pypa/cibuildwheel@298ed2fb2c105540f5ed055e8a6ad78d82dd3a7e # v3.3.1 env: diff --git a/pyproject.toml b/pyproject.toml index 399b0e23..1209c9d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -117,9 +117,7 @@ PKG_CONFIG_PATH = "$(pwd)/.local/lib/pkgconfig" PKG_CONFIG_PATH = "$(pwd)/.local/lib/pkgconfig" [tool.cibuildwheel.windows.environment] -# Setting PKG_CONFIG_PATH here breaks pkgconfig for some reason... -# We set it in the CI workflow instead. -# PKG_CONFIG_PATH = "$(pwd)/.local/lib/pkgconfig:$PKG_CONFIG_PATH" +PKG_CONFIG_PATH = "$(pwd)/.local/lib/pkgconfig;$PKG_CONFIG_PATH" [tool.cibuildwheel.linux] before-all = "bin/cibw_before_all_linux_$(uname -m).sh"