[colmap] Re-enable pipeline test on OSX (microsoft#23554)

* [colmap] Re-enable pipeline test on OSX * version * cleanup baseline
SupSuper · Mar 18, 2022 · cac3fe6 · cac3fe6
1 parent 2c0fb4f
commit cac3fe6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/ports/colmap/fix-dependency-freeimage.patch → ports/colmap/fix-dependencies.patch b/ports/colmap/fix-dependency-freeimage.patch → ports/colmap/fix-dependencies.patch
@@ -1,14 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b05097c..cdd8ca4 100644
+index 4759a94..3d25164 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -96,7 +96,8 @@ find_package(Boost REQUIRED COMPONENTS
+@@ -98,9 +98,11 @@ find_package(Boost REQUIRED COMPONENTS
 
  find_package(Eigen3 REQUIRED)
 
 -find_package(FreeImage REQUIRED)
 +find_package(freeimage CONFIG REQUIRED)
 +set(FREEIMAGE_LIBRARIES freeimage::FreeImage)
 
+-find_package(Metis REQUIRED)
++find_package(metis CONFIG REQUIRED)
++set(METIS_LIBRARIES metis)
+
  find_package(Glog REQUIRED)
 
diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake
@@ -1,13 +1,13 @@
-set(COLMAP_REF "3.7")
+set(COLMAP_REF "29a1e3642a3b00734a52b21e597ea4d576485fe6") # 3.7 fix
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO colmap/colmap
     REF ${COLMAP_REF}
-    SHA512 a0c943383b9c8028e646e1cbcd9aab5f778c4f9e26a627da6c9d938b5816425d08f2ba651498b60f3b3ba1b8d4c5e6f82b5717b5d97778b99629170a988143ab
+    SHA512 c22511592dadd1fce51baeaa5ab3ca48b0df5f1c02f9e2a97593ea1b01c5aea0e1054063a5665e2653f2c7b1b7525ce4c62ae35fb4197df614112861045b76fd
     HEAD_REF dev
     PATCHES
-        fix-dependency-freeimage.patch
+        fix-dependencies.patch
 )
 
 if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES))

diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "colmap",
-  "version-string": "3.7",
+  "version-date": "2022-03-14",
   "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.",
   "homepage": "https://colmap.github.io/",
   "license": "BSD-3-Clause",

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -155,8 +155,6 @@ coin:arm64-windows=fail
 coin:arm-uwp=fail
 coin:x64-uwp=fail
 
-# https://github.com/colmap/colmap/issues/1421
-colmap:x64-osx=fail
 # there is an ICE in VS2022 with colmap in release mode
 colmap:x86-windows=fail
 colmap:x64-windows=fail

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1477,7 +1477,7 @@
       "port-version": 6
     },
     "colmap": {
-      "baseline": "3.7",
+      "baseline": "2022-03-14",
       "port-version": 0
     },
     "comms": {

diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bf74fe8bdad103c3212e029ac7e736c759be2aa8",
+      "version-date": "2022-03-14",
+      "port-version": 0
+    },
     {
       "git-tree": "81329023ad5f9b2bd27554d2d8a97f8e63aef708",
       "version-string": "3.7",