[colmap] Update to port version 3.11.1 (microsoft#42477)

ParvusLacertus · Dec 16, 2024 · aa59239 · aa59239
1 parent fa46408
commit aa59239
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 15 deletions.
diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake
@@ -1,10 +1,10 @@
-set(COLMAP_REF "0bd66d901c7549051e21e8f648777f802eb20a73") # v3.10
+set(COLMAP_REF "aa087848a8bd09cebf3e3cc8a5732552f30c51ad") # v3.11.1
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO colmap/colmap
     REF "${VERSION}"
-    SHA512 1bcb6b1a740d07666e9f1dcc813bd4464113d0054238c0f86a0ed94099918947d1a58d83661f8ff3fc699727627436b2b555c5d51d37c8ebad7f590155dcb43d
+    SHA512 1260db4346cc33c6c35efdee0157450fccef67dbc9de876fdc997c7cb90daec716e5ccec97df0a77e3e8686f43ec79f2c0a1523ea12eca2ee158347cb52dea48
     HEAD_REF main
 )
 
@@ -21,8 +21,15 @@ endif()
 
 string(TIMESTAMP COLMAP_GIT_COMMIT_DATE "%Y-%m-%d")
 
+foreach(FEATURE ${FEATURE_OPTIONS})
+    message(STATUS "${FEATURE}")
+endforeach()
+
 set(CUDA_ENABLED OFF)
+set(GUI_ENABLED OFF)
 set(TESTS_ENABLED OFF)
+set(CGAL_ENABLED OFF)
+set(OPENMP_ENABLED ON)
 
 if("cuda" IN_LIST FEATURES)
     set(CUDA_ENABLED ON)
@@ -34,13 +41,20 @@ if("cuda-redist" IN_LIST FEATURES)
     set(CUDA_ARCHITECTURES "all-major")
 endif()
 
+if("gui" IN_LIST FEATURES)
+    set(GUI_ENABLED ON)
+endif()
+
 if("tests" IN_LIST FEATURES)
     set(TESTS_ENABLED ON)
 endif()
 
-set(OPENMP_ENABLED ON)
+if("cgal" IN_LIST FEATURES)
+    set(CGAL_ENABLED ON)
+endif()
+
 if (VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
-    set(OPENMP_ENABLED Off)
+    set(OPENMP_ENABLED OFF)
 endif()
 
 vcpkg_cmake_configure(
@@ -49,10 +63,13 @@ vcpkg_cmake_configure(
     OPTIONS
         -DCUDA_ENABLED=${CUDA_ENABLED}
         -DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES}
+        -DGUI_ENABLED=${GUI_ENABLED}
         -DTESTS_ENABLED=${TESTS_ENABLED}
         -DGIT_COMMIT_ID=${GIT_COMMIT_ID}
         -DGIT_COMMIT_DATE=${COLMAP_GIT_COMMIT_DATE}
         -DOPENMP_ENABLED=${OPENMP_ENABLED}
+        -DCGAL_ENABLED=${CGAL_ENABLED}
+        -DFETCH_POSELIB=OFF
 )
 
 vcpkg_cmake_install()

diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json
@@ -1,31 +1,35 @@
 {
   "name": "colmap",
-  "version": "3.10",
+  "version": "3.11.1",
   "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",
-  "supports": "(linux | (windows & !static) | osx) & (x86 | x64)",
+  "supports": "(linux | (windows & !static) | osx) & (x86 | x64 | arm64)",
   "dependencies": [
-    "boost-filesystem",
+    "boost-algorithm",
     "boost-graph",
+    "boost-heap",
     "boost-program-options",
-    "boost-system",
-    "boost-test",
+    "boost-property-map",
+    "boost-property-tree",
     {
       "name": "ceres",
       "features": [
         "lapack",
         "suitesparse"
       ]
     },
-    "cgal",
     "eigen3",
     "flann",
     "freeimage",
     "gflags",
-    "glew",
     "glog",
-    "qt5-base",
+    {
+      "name": "jasper",
+      "default-features": false
+    },
+    "metis",
+    "poselib",
     "sqlite3",
     {
       "name": "vcpkg-cmake",
@@ -36,11 +40,21 @@
       "host": true
     }
   ],
+  "default-features": [
+    "gui"
+  ],
   "features": {
+    "cgal": {
+      "description": "Build with CGAL.",
+      "dependencies": [
+        "cgal"
+      ]
+    },
     "cuda": {
-      "description": "CUDA support for current compute architecture of this machine.",
+      "description": "Build with CUDA.",
       "dependencies": [
-        "cuda"
+        "cuda",
+        "glew"
       ]
     },
     "cuda-redist": {
@@ -49,6 +63,13 @@
         "cuda"
       ]
     },
+    "gui": {
+      "description": "Build the GUI.",
+      "dependencies": [
+        "glew",
+        "qt5-base"
+      ]
+    },
     "tests": {
       "description": "Build all tests.",
       "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1809,7 +1809,7 @@
       "port-version": 11
     },
     "colmap": {
-      "baseline": "3.10",
+      "baseline": "3.11.1",
       "port-version": 0
     },
     "color-console": {

diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e07255def3b7cf947532848a0edfe51f66cd6f66",
+      "version": "3.11.1",
+      "port-version": 0
+    },
     {
       "git-tree": "29a181de8c80f9008a9a46657a16ed187530a59b",
       "version": "3.10",