From 17f85fdf5750b01f1245073102c979dc84490780 Mon Sep 17 00:00:00 2001
From: Paul-Edouard Sarlin <15985472+sarlinpe@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:38:14 +0100
Subject: [PATCH] Fix
---
.github/workflows/build-new.yml | 2 +-
package/install-colmap-windows.ps1 | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/.github/workflows/build-new.yml b/.github/workflows/build-new.yml
index dd2b54b..9cf9cb5 100644
--- a/.github/workflows/build-new.yml
+++ b/.github/workflows/build-new.yml
@@ -80,7 +80,7 @@ jobs:
$CONFIG_SETTINGS = "cmake.define.CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}"
$CONFIG_SETTINGS = "${CONFIG_SETTINGS} cmake.define.VCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}"
echo "CIBW_CONFIG_SETTINGS_WINDOWS=${CONFIG_SETTINGS}" >> "${env:GITHUB_ENV}"
- $CIBW_REPAIR_WHEEL_COMMAND = "delvewheel repair -v --add-path ${VCPKG_INSTALLATION_ROOT}/${VCPKG_TARGET_TRIPLET}/bin -w {dest_dir} {wheel}"
+ $CIBW_REPAIR_WHEEL_COMMAND = "delvewheel repair -v --add-path ${VCPKG_INSTALLATION_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/bin -w {dest_dir} {wheel}"
echo "CIBW_REPAIR_WHEEL_COMMAND_WINDOWS=${CIBW_REPAIR_WHEEL_COMMAND}" >> "${env:GITHUB_ENV}"
# vcpkg binary caching
diff --git a/package/install-colmap-windows.ps1 b/package/install-colmap-windows.ps1
index adff452..f14a1cd 100755
--- a/package/install-colmap-windows.ps1
+++ b/package/install-colmap-windows.ps1
@@ -46,8 +46,6 @@ $DEPS.Remove("glew")
& "${env:VCPKG_INSTALLATION_ROOT}/vcpkg.exe" install --recurse --clean-after-build @DEPS
& "${env:VCPKG_INSTALLATION_ROOT}/vcpkg.exe" integrate install
-Get-ChildItem ${env:VCPKG_INSTALLATION_ROOT}/${env:VCPKG_TARGET_TRIPLET}/bin
-
mkdir build
cd build
cmake .. `