Skip to content

Commit

Permalink
[colmap] Upgrade to version 3.7 (#22805)
Browse files Browse the repository at this point in the history
* [colmap] Upgrade to version 3.7

* Format

* version
  • Loading branch information
ahojnnes committed Jan 27, 2022
1 parent 45b0a6b commit 7baf7bc
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions ports/colmap/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
set(COLMAP_REF "3.6")
set(COLMAP_REF "3.7")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO colmap/colmap
REF ${COLMAP_REF}
SHA512 9a4b4f2a49891ce8ac32ab1f2e9b859336326bada889e6de49c017a069884bb6c8ab8a2ae430d955e58fc22377c63e8fba9ce80ff959713e2878e29814d44632
SHA512 a0c943383b9c8028e646e1cbcd9aab5f778c4f9e26a627da6c9d938b5816425d08f2ba651498b60f3b3ba1b8d4c5e6f82b5717b5d97778b99629170a988143ab
HEAD_REF dev
PATCHES
fix-dependency-freeimage.patch
Expand Down
6 changes: 2 additions & 4 deletions ports/colmap/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{
"name": "colmap",
"version-string": "3.6",
"port-version": 2,
"version-string": "3.7",
"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",
"dependencies": [
"boost-filesystem",
"boost-graph",
"boost-program-options",
"boost-regex",
"boost-system",
"boost-test",
{
Expand Down Expand Up @@ -55,7 +53,7 @@
]
},
"tests": {
"description": "Enable TESTS."
"description": "Build all tests."
}
}
}
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1461,8 +1461,8 @@
"port-version": 6
},
"colmap": {
"baseline": "3.6",
"port-version": 2
"baseline": "3.7",
"port-version": 0
},
"comms": {
"baseline": "3.4.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/colmap.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "81329023ad5f9b2bd27554d2d8a97f8e63aef708",
"version-string": "3.7",
"port-version": 0
},
{
"git-tree": "7d3a2a8f71b464856f91f3b8b7e2362ec27d6487",
"version-string": "3.6",
Expand Down

0 comments on commit 7baf7bc

Please sign in to comment.