[colmap] Update COLMAP port to 3.8 (#29433)

* Update COLMAP version to 3.8

* date

* version

* patch

* f

* format

* f

* c

* c

* f

* d

* d

* d

* f

* revert patch formating

* update version

* n

* n

* f

* f

* f

---------

Co-authored-by: Jonliu1993 <13720414433@163.com>
This commit is contained in:
Johannes Schönberger 2023-03-15 18:34:06 +01:00 committed by GitHub
parent 7c34d0cb29
commit 44070ccd78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 12 deletions

View File

@ -1,15 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4759a94..3d25164 100644
index 2a9724e..95d4d7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,9 +98,11 @@ find_package(Boost REQUIRED COMPONENTS
@@ -99,12 +99,14 @@ find_package(Boost REQUIRED COMPONENTS
find_package(Eigen3 REQUIRED)
-find_package(FreeImage REQUIRED)
+find_package(freeimage CONFIG REQUIRED)
+find_package(FreeImage CONFIG REQUIRED)
+set(FREEIMAGE_LIBRARIES freeimage::FreeImage)
find_package(FLANN REQUIRED)
find_package(LZ4 REQUIRED)
-find_package(Metis REQUIRED)
+find_package(metis CONFIG REQUIRED)
+set(METIS_LIBRARIES metis)

View File

@ -1,10 +1,10 @@
set(COLMAP_REF "29a1e3642a3b00734a52b21e597ea4d576485fe6") # 3.7 fix
set(COLMAP_REF "30da037ce19bdceb6d239c45342fadb221bdabb2") # 3.8 with bugfixes
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO colmap/colmap
REF ${COLMAP_REF}
SHA512 c22511592dadd1fce51baeaa5ab3ca48b0df5f1c02f9e2a97593ea1b01c5aea0e1054063a5665e2653f2c7b1b7525ce4c62ae35fb4197df614112861045b76fd
REF "${COLMAP_REF}"
SHA512 2aad3c39efee025bebdbec41215f32968c3a63e160f9e7de0a6a2bf2d2c96bb1c20af0e10173d1d81ed4712e58fd97e7c8aabef8f9c47cc542d89b14c6ae420d
HEAD_REF dev
PATCHES
fix-dependencies.patch
@ -28,11 +28,12 @@ set(TESTS_ENABLED OFF)
if("cuda" IN_LIST FEATURES)
set(CUDA_ENABLED ON)
set(CUDA_ARCHITECTURES "native")
endif()
if("cuda-redist" IN_LIST FEATURES)
set(CUDA_ENABLED ON)
set(CUDA_ARCHS "Common")
set(CUDA_ARCHITECTURES "all-major")
endif()
if("tests" IN_LIST FEATURES)
@ -49,7 +50,7 @@ vcpkg_cmake_configure(
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DCUDA_ENABLED=${CUDA_ENABLED}
-DCUDA_ARCHS=${CUDA_ARCHS}
-DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES}
-DTESTS_ENABLED=${TESTS_ENABLED}
-DGIT_COMMIT_ID=${GIT_COMMIT_ID}
-DGIT_COMMIT_DATE=${COLMAP_GIT_COMMIT_DATE}

View File

@ -1,7 +1,6 @@
{
"name": "colmap",
"version-date": "2022-03-14",
"port-version": 2,
"version-date": "2023-03-12",
"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",
@ -25,11 +24,13 @@
]
},
"eigen3",
"flann",
"freeimage",
"gflags",
"glew",
"glog",
"qt5-base",
"sqlite3",
"suitesparse",
{
"name": "vcpkg-cmake",

View File

@ -1629,8 +1629,8 @@
"port-version": 8
},
"colmap": {
"baseline": "2022-03-14",
"port-version": 2
"baseline": "2023-03-12",
"port-version": 0
},
"color-console": {
"baseline": "2022-03-20",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "31fb7f3106b019ceca3838a9461d372244125f63",
"version-date": "2023-03-12",
"port-version": 0
},
{
"git-tree": "4651c5d183a76d29f6b565efdd3443fca8809250",
"version-date": "2022-03-14",