Fix

colmap · Jan 23, 2024 · 17f85fd · 17f85fd
1 parent 2dba6ba
commit 17f85fd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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 .. `