Skip to content

Commit 60965dd

Browse files
committed
Update cibuildwheel configuration
1 parent e5d81f3 commit 60965dd

4 files changed

Lines changed: 20 additions & 7 deletions

File tree

cibuildwheel_scripts/before-all.linux.bash

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ fi
2525

2626
# Bootstrap the installation
2727
cd "$VCPKG_ROOT"
28-
./bootstrap-vcpkg.sh -disableMetrics
28+
env -u CMAKE_TOOLCHAIN_FILE -u CMAKE_PREFIX_PATH -u CMAKE_MODULE_PATH \
29+
./bootstrap-vcpkg.sh -disableMetrics
2930

3031
echo "set(VCPKG_BUILD_TYPE release)" | tee -a triplets/${VCPKG_DEFAULT_TRIPLET:-x64-linux}.cmake
3132

cibuildwheel_scripts/before-all.windows.ps1

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,22 @@ $env:VCPKG_ROOT = "C:\vcpkg"
66
if (-not (Test-Path $env:VCPKG_ROOT)) {
77
git clone https://github.com/microsoft/vcpkg.git $env:VCPKG_ROOT
88
}
9+
10+
# Clear and backup existing CMake environment variables
11+
$backupVars = @{}
12+
foreach ($var in @("CMAKE_TOOLCHAIN_FILE", "CMAKE_PREFIX_PATH", "CMAKE_MODULE_PATH")) {
13+
if (Test-Path "Env:$var") {
14+
$backupVars[$var] = (Get-Item "Env:$var").Value
15+
Remove-Item "Env:$var"
16+
}
17+
}
18+
919
& "$env:VCPKG_ROOT\bootstrap-vcpkg.bat" -disableMetrics | Out-Host
1020

21+
# Restore backed up CMake environment variables
22+
foreach ($kv in $backupVars.GetEnumerator()) {
23+
Set-Item "Env:$($kv.Key)" $kv.Value
24+
}
25+
1126
# install eigen3
12-
& "$env:VCPKG_ROOT\vcpkg" install "Eigen3:x64-windows"
27+
& "$env:VCPKG_ROOT\vcpkg" install "Eigen3:$env:VCPKG_TARGET_TRIPLET"

install_scripts/install_vcpkg.ubuntu.bash

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ fi
2323
cd "$INSTALL_DIR"
2424
./bootstrap-vcpkg.sh -disableMetrics
2525

26-
# Set default to install release version of libraries
27-
echo "set(VCPKG_BUILD_TYPE release)" | tee -a triplets/x64-linux.cmake
28-
2926
# Add line if missing function
3027
add_line_if_missing () {
3128
local line="$1"

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ before-all = "powershell -ExecutionPolicy Bypass -File cibuildwheel_scripts/befo
5959
archs = ["AMD64"]
6060

6161
[tool.cibuildwheel.windows.environment]
62-
VCPKG_ROOT = "C:\\vcpkg"
62+
VCPKG_ROOT = "C:/vcpkg"
6363
VCPKG_TARGET_TRIPLET = "x64-windows"
64-
CMAKE_TOOLCHAIN_FILE = "C:\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake"
64+
CMAKE_TOOLCHAIN_FILE = "C:/vcpkg/scripts/buildsystems/vcpkg.cmake"

0 commit comments

Comments
 (0)