[colmap] Update to 3.9.1 (#39244)

Fixes #38774
Fixes #36570
Fixes #38768
Fixes #30272
Fixes #37831
This commit is contained in:
Lily Wang 2024-06-12 14:31:36 -07:00 committed by GitHub
parent 573516aa28
commit ac02bdb77e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 9 deletions

View File

@ -23,12 +23,12 @@ index 64381cb..875bea2 100644
colmap_util
colmap_sensor
diff --git a/src/colmap/retrieval/CMakeLists.txt b/src/colmap/retrieval/CMakeLists.txt
index 2ff5dfd..687d8ea 100644
index 903a935..cb8ad6a 100644
--- a/src/colmap/retrieval/CMakeLists.txt
+++ b/src/colmap/retrieval/CMakeLists.txt
@@ -43,6 +43,7 @@ COLMAP_ADD_LIBRARY(
PUBLIC_LINK_LIBS
Boost::graph
Boost::boost
Eigen3::Eigen
+ glog::glog
flann

View File

@ -1,10 +1,10 @@
set(COLMAP_REF "9c704e89ff0a80e797725e112011f9f69e5aa28f") # Oct 1, 2023
set(COLMAP_REF "e99036415ec0cf0f75c1d0b8d60fdd91af0d6c68") # v3.9.1
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO colmap/colmap
REF "${COLMAP_REF}"
SHA512 6ece735c403304c14887cd9b2b13a7e36bf07155fa959748c09d74854e0da6338766c11e6a371c26f983ccdb29f93b2600d685c907a5a137fe20d798b26805d8
REF "${VERSION}"
SHA512 8af849f99e7f7bd024d8aaa0c66ae9192fd1a6f63869b96d77300e5203ac510f5359456567a786e29b14cbd1d580d1e3305194c3db8fd6ce10c1d592f988294c
HEAD_REF main
PATCHES
fix-link-glog.patch

View File

@ -1,7 +1,6 @@
{
"name": "colmap",
"version-date": "2023-10-01",
"port-version": 1,
"version": "3.9.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",

View File

@ -1781,8 +1781,8 @@
"port-version": 11
},
"colmap": {
"baseline": "2023-10-01",
"port-version": 1
"baseline": "3.9.1",
"port-version": 0
},
"color-console": {
"baseline": "2022-03-20",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "baca06856960d0b705e668bc376b84ebf565e3ce",
"version": "3.9.1",
"port-version": 0
},
{
"git-tree": "085e4234e54332750bcde82ced25af0078000d2c",
"version-date": "2023-10-01",