From 545d7e6183525a311bd88cc5a63a29a070c759c3 Mon Sep 17 00:00:00 2001
From: Paul-Edouard Sarlin <paul.edouard.sarlin@gmail.com>
Date: Fri, 29 Dec 2023 17:52:04 +0100
Subject: [PATCH] Cleanup

---
 .github/workflows/build-new.yml |  6 +++---
 package/install-colmap-macos.sh | 35 +++++++++++++++++++++------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-new.yml b/.github/workflows/build-new.yml
index ebfaf4d4..9917c322 100644
--- a/.github/workflows/build-new.yml
+++ b/.github/workflows/build-new.yml
@@ -24,6 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set architecture env
+        if: ${{ startsWith(matrix.config.os, 'macos') }}
         run: |
           if [[ ${{ matrix.config.arch }} == "x86_64" ]]; then
             VCPKG_TARGET_TRIPLET="x64-osx"
@@ -41,12 +42,11 @@ jobs:
           echo "CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" >> "$GITHUB_ENV"
           echo "CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}" >> "$GITHUB_ENV"
 
+          # Fix: cibuildhweel cannot interpolate env variables.
           CONFIG_SETTINGS="cmake.define.CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}"
           CONFIG_SETTINGS="${CONFIG_SETTINGS} cmake.define.VCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}"
           CONFIG_SETTINGS="${CONFIG_SETTINGS} cmake.define.CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}"
           echo "CIBW_CONFIG_SETTINGS_MACOS=${CONFIG_SETTINGS}" >> "$GITHUB_ENV"
-
-        if: ${{ startsWith(matrix.config.os, 'macos') }}
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.16.2
         env:
@@ -54,7 +54,7 @@ jobs:
       - name: Archive wheels
         uses: actions/upload-artifact@v3
         with:
-          name: pycolmap-${{ matrix.config.os }}
+          name: pycolmap-${{ matrix.config.os }}-${{ matrix.config.arch }}
           path: wheelhouse/pycolmap-*.whl
 
   pypi-publish:
diff --git a/package/install-colmap-macos.sh b/package/install-colmap-macos.sh
index 2904d334..9b3376f7 100755
--- a/package/install-colmap-macos.sh
+++ b/package/install-colmap-macos.sh
@@ -15,16 +15,7 @@ brew remove swiftlint
 brew remove node@18
 
 brew update
-brew install \
-    git \
-    wget \
-    cmake \
-    llvm
-
-# for lapack-reference
-export CMAKE_Fortran_COMPILER=$(which gfortran-13)
-export CMAKE_Fortran_COMPILER_INIT="gfortran-13"
-ln -s $(which gfortran-13) "$(dirname $(which gfortran-13))/gfortran"
+brew install git cmake llvm
 
 cd ${CURRDIR}
 #git clone https://github.com/microsoft/vcpkg ${VCPKG_INSTALLATION_ROOT}
@@ -32,7 +23,25 @@ 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,tools]
+./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 \
+    ceres[lapack,suitesparse,tools] \
+    eigen3 \
+    flann \
+    freeimage \
+    metis \
+    gflags \
+    glog \
+    gtest \
+    sqlite3
 ./vcpkg integrate install
 
 cd ${CURRDIR}
@@ -44,8 +53,8 @@ export ARCHFLAGS="-arch ${CIBW_ARCHS_MACOS}"
 cmake .. -DGUI_ENABLED=OFF \
     -DCUDA_ENABLED=OFF \
     -DCGAL_ENABLED=OFF \
-    -DCMAKE_TOOLCHAIN_FILE="${VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" \
+    -DCMAKE_TOOLCHAIN_FILE="${CMAKE_TOOLCHAIN_FILE}" \
     -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} \
-    -DCMAKE_OSX_ARCHITECTURES=${CIBW_ARCHS_MACOS} \
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} \
     `if [[ ${CIBW_ARCHS_MACOS} == "arm64" ]]; then echo "-DSIMD_ENABLED=OFF"; fi`
 make -j ${NUM_LOGICAL_CPUS} install