Add vcpkg flags back to COLMAP

colmap · Dec 23, 2023 · 8266ca8 · 8266ca8
1 parent 7f0554b
commit 8266ca8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/build-new.yml b/.github/workflows/build-new.yml
@@ -20,8 +20,8 @@ jobs:
  {os: ubuntu-latest},
  {os: macos-12, arch: x86_64},
  {os: macos-13, arch: x86_64},
- #{os: macos-12, arch: arm64},
- #{os: macos-13, arch: arm64},
+ {os: macos-12, arch: arm64},
+ {os: macos-13, arch: arm64},
  ]
  steps:
  - uses: actions/checkout@v4

diff --git a/package/install-colmap-macos.sh b/package/install-colmap-macos.sh
@@ -32,7 +32,7 @@ git clone --branch sarlinpe/lapack-osx https://github.com/sarlinpe/vcpkg ${VCPKG
 
 cd ${VCPKG_INSTALLATION_ROOT}
 ./bootstrap-vcpkg.sh
-./vcpkg install --recurse --clean-after-build --triplet=${VCPKG_TARGET_TRIPLET} boost-algorithm boost-filesystem boost-graph boost-heap boost-program-options boost-property-map boost-property-tree boost-regex boost-system eigen3 flann freeimage metis gflags glog gtest sqlite3 ceres[lapack,suitesparse]
+./vcpkg install --recurse --clean-after-build --triplet=${VCPKG_TARGET_TRIPLET} boost-algorithm boost-filesystem boost-graph boost-heap boost-program-options boost-property-map boost-property-tree boost-regex boost-system eigen3 flann freeimage metis gflags glog gtest sqlite3 ceres[lapack,suitesparse,tools]
 ./vcpkg integrate install
 
 cd ${CURRDIR}
@@ -42,5 +42,7 @@ git checkout c0355417328f3706a30a9265fd52bc7a5aa4cb8c
 mkdir build && cd build
 cmake .. -DGUI_ENABLED=OFF \
  -DCUDA_ENABLED=OFF \
- -DCGAL_ENABLED=OFF
+ -DCGAL_ENABLED=OFF \
+ -DCMAKE_TOOLCHAIN_FILE=${VCPKG_INSTALLATION_ROOT} \
+ -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}
 make -j ${NUM_LOGICAL_CPUS} install