Skip to content

Commit aa59239

Browse files
authored
[colmap] Update to port version 3.11.1 (microsoft#42477)
1 parent fa46408 commit aa59239

File tree

4 files changed

+58
-15
lines changed

4 files changed

+58
-15
lines changed

ports/colmap/portfile.cmake

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
set(COLMAP_REF "0bd66d901c7549051e21e8f648777f802eb20a73") # v3.10
1+
set(COLMAP_REF "aa087848a8bd09cebf3e3cc8a5732552f30c51ad") # v3.11.1
22

33
vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO colmap/colmap
66
REF "${VERSION}"
7-
SHA512 1bcb6b1a740d07666e9f1dcc813bd4464113d0054238c0f86a0ed94099918947d1a58d83661f8ff3fc699727627436b2b555c5d51d37c8ebad7f590155dcb43d
7+
SHA512 1260db4346cc33c6c35efdee0157450fccef67dbc9de876fdc997c7cb90daec716e5ccec97df0a77e3e8686f43ec79f2c0a1523ea12eca2ee158347cb52dea48
88
HEAD_REF main
99
)
1010

@@ -21,8 +21,15 @@ endif()
2121

2222
string(TIMESTAMP COLMAP_GIT_COMMIT_DATE "%Y-%m-%d")
2323

24+
foreach(FEATURE ${FEATURE_OPTIONS})
25+
message(STATUS "${FEATURE}")
26+
endforeach()
27+
2428
set(CUDA_ENABLED OFF)
29+
set(GUI_ENABLED OFF)
2530
set(TESTS_ENABLED OFF)
31+
set(CGAL_ENABLED OFF)
32+
set(OPENMP_ENABLED ON)
2633

2734
if("cuda" IN_LIST FEATURES)
2835
set(CUDA_ENABLED ON)
@@ -34,13 +41,20 @@ if("cuda-redist" IN_LIST FEATURES)
3441
set(CUDA_ARCHITECTURES "all-major")
3542
endif()
3643

44+
if("gui" IN_LIST FEATURES)
45+
set(GUI_ENABLED ON)
46+
endif()
47+
3748
if("tests" IN_LIST FEATURES)
3849
set(TESTS_ENABLED ON)
3950
endif()
4051

41-
set(OPENMP_ENABLED ON)
52+
if("cgal" IN_LIST FEATURES)
53+
set(CGAL_ENABLED ON)
54+
endif()
55+
4256
if (VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
43-
set(OPENMP_ENABLED Off)
57+
set(OPENMP_ENABLED OFF)
4458
endif()
4559

4660
vcpkg_cmake_configure(
@@ -49,10 +63,13 @@ vcpkg_cmake_configure(
4963
OPTIONS
5064
-DCUDA_ENABLED=${CUDA_ENABLED}
5165
-DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES}
66+
-DGUI_ENABLED=${GUI_ENABLED}
5267
-DTESTS_ENABLED=${TESTS_ENABLED}
5368
-DGIT_COMMIT_ID=${GIT_COMMIT_ID}
5469
-DGIT_COMMIT_DATE=${COLMAP_GIT_COMMIT_DATE}
5570
-DOPENMP_ENABLED=${OPENMP_ENABLED}
71+
-DCGAL_ENABLED=${CGAL_ENABLED}
72+
-DFETCH_POSELIB=OFF
5673
)
5774

5875
vcpkg_cmake_install()

ports/colmap/vcpkg.json

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,35 @@
11
{
22
"name": "colmap",
3-
"version": "3.10",
3+
"version": "3.11.1",
44
"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.",
55
"homepage": "https://colmap.github.io/",
66
"license": "BSD-3-Clause",
7-
"supports": "(linux | (windows & !static) | osx) & (x86 | x64)",
7+
"supports": "(linux | (windows & !static) | osx) & (x86 | x64 | arm64)",
88
"dependencies": [
9-
"boost-filesystem",
9+
"boost-algorithm",
1010
"boost-graph",
11+
"boost-heap",
1112
"boost-program-options",
12-
"boost-system",
13-
"boost-test",
13+
"boost-property-map",
14+
"boost-property-tree",
1415
{
1516
"name": "ceres",
1617
"features": [
1718
"lapack",
1819
"suitesparse"
1920
]
2021
},
21-
"cgal",
2222
"eigen3",
2323
"flann",
2424
"freeimage",
2525
"gflags",
26-
"glew",
2726
"glog",
28-
"qt5-base",
27+
{
28+
"name": "jasper",
29+
"default-features": false
30+
},
31+
"metis",
32+
"poselib",
2933
"sqlite3",
3034
{
3135
"name": "vcpkg-cmake",
@@ -36,11 +40,21 @@
3640
"host": true
3741
}
3842
],
43+
"default-features": [
44+
"gui"
45+
],
3946
"features": {
47+
"cgal": {
48+
"description": "Build with CGAL.",
49+
"dependencies": [
50+
"cgal"
51+
]
52+
},
4053
"cuda": {
41-
"description": "CUDA support for current compute architecture of this machine.",
54+
"description": "Build with CUDA.",
4255
"dependencies": [
43-
"cuda"
56+
"cuda",
57+
"glew"
4458
]
4559
},
4660
"cuda-redist": {
@@ -49,6 +63,13 @@
4963
"cuda"
5064
]
5165
},
66+
"gui": {
67+
"description": "Build the GUI.",
68+
"dependencies": [
69+
"glew",
70+
"qt5-base"
71+
]
72+
},
5273
"tests": {
5374
"description": "Build all tests.",
5475
"dependencies": [

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1809,7 +1809,7 @@
18091809
"port-version": 11
18101810
},
18111811
"colmap": {
1812-
"baseline": "3.10",
1812+
"baseline": "3.11.1",
18131813
"port-version": 0
18141814
},
18151815
"color-console": {

versions/c-/colmap.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "e07255def3b7cf947532848a0edfe51f66cd6f66",
5+
"version": "3.11.1",
6+
"port-version": 0
7+
},
38
{
49
"git-tree": "29a181de8c80f9008a9a46657a16ed187530a59b",
510
"version": "3.10",

0 commit comments

Comments
 (0)