diff --git a/ports/colmap/fix-dependencies.patch b/ports/colmap/fix-dependencies.patch deleted file mode 100644 index 5483b3087d..0000000000 --- a/ports/colmap/fix-dependencies.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- CMakeLists.txt.orig 2023-03-12 19:26:41.000000000 +0100 -+++ CMakeLists.txt 2023-03-27 11:27:43.840624719 +0200 -@@ -99,14 +99,17 @@ - - find_package(Eigen3 REQUIRED) - --find_package(FreeImage 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) - --find_package(Glog REQUIRED) -+find_package(glog CONFIG REQUIRED) -+set(GLOG_LIBRARIES glog::glog) - - find_package(SQLite3 REQUIRED) - diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index 399f54daa0..e54cbdafc7 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -1,13 +1,11 @@ -set(COLMAP_REF "30da037ce19bdceb6d239c45342fadb221bdabb2") # 3.8 with bugfixes +set(COLMAP_REF "9c704e89ff0a80e797725e112011f9f69e5aa28f") # Oct 1, 2023 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO colmap/colmap REF "${COLMAP_REF}" - SHA512 2aad3c39efee025bebdbec41215f32968c3a63e160f9e7de0a6a2bf2d2c96bb1c20af0e10173d1d81ed4712e58fd97e7c8aabef8f9c47cc542d89b14c6ae420d - HEAD_REF dev - PATCHES - fix-dependencies.patch + SHA512 6ece735c403304c14887cd9b2b13a7e36bf07155fa959748c09d74854e0da6338766c11e6a371c26f983ccdb29f93b2600d685c907a5a137fe20d798b26805d8 + HEAD_REF main ) if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) @@ -74,7 +72,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/include/colmap/exe" - "${CURRENT_PACKAGES_DIR}/include/colmap/lib/Graclus/multilevelLib" "${CURRENT_PACKAGES_DIR}/include/colmap/tools" "${CURRENT_PACKAGES_DIR}/include/colmap/ui/media" "${CURRENT_PACKAGES_DIR}/include/colmap/ui/shaders" diff --git a/ports/colmap/usage b/ports/colmap/usage index b71316b3cf..75f933163f 100644 --- a/ports/colmap/usage +++ b/ports/colmap/usage @@ -7,4 +7,4 @@ For example, under Windows, execute COLMAP as: The package colmap provides CMake integration: find_package(COLMAP REQUIRED) - target_link_libraries(main ${COLMAP_LIBRARIES}) + target_link_libraries(main colmap::colmap) diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index 1f54a343ed..8ce753f8bd 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,10 +1,10 @@ { "name": "colmap", - "version-date": "2023-03-12", - "port-version": 1, + "version-date": "2023-10-01", "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)", "dependencies": [ "boost-filesystem", "boost-graph", @@ -18,12 +18,7 @@ "suitesparse" ] }, - { - "name": "cgal", - "features": [ - "qt" - ] - }, + "cgal", "eigen3", "flann", "freeimage", @@ -32,7 +27,6 @@ "glog", "qt5-base", "sqlite3", - "suitesparse", { "name": "vcpkg-cmake", "host": true @@ -56,7 +50,10 @@ ] }, "tests": { - "description": "Build all tests." + "description": "Build all tests.", + "dependencies": [ + "gtest" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index a771a1b695..090bbc11ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1709,8 +1709,8 @@ "port-version": 10 }, "colmap": { - "baseline": "2023-03-12", - "port-version": 1 + "baseline": "2023-10-01", + "port-version": 0 }, "color-console": { "baseline": "2022-03-20", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index ea652317e7..46334e0dfd 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3482baa430e8733afa927fae4d3951e300a5c67", + "version-date": "2023-10-01", + "port-version": 0 + }, { "git-tree": "be5a8b2aa2354b0d3aec03253dcd13358ba950da", "version-date": "2023-03-12",