[cgal] update to 5.5.2 (#30341)

* [cgal] update to 5.5.2

* [cgal] vcpkg x-add-version --all

* fix colmap compilation

* vcpkg x-add-version --all

---------

Co-authored-by: Monica <v-liumonica@microsoft.com>
This commit is contained in:
Laurent Rineau 2023-04-04 20:11:44 +02:00 committed by GitHub
parent 809e9db912
commit 470a5f6ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 11 deletions

View File

@ -4,8 +4,8 @@ vcpkg_buildpath_length_warning(37)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CGAL/cgal
REF v5.5.1
SHA512 5d247608ca19b46cddf9971a45829848904d1645dec9edf5059b15ae3be34c5b063e4e8be2e7018f7d754e7d1b16116d51ca8bc5c609a0a813df07a16118b5ce
REF v5.5.2
SHA512 0928081656cf52254f70a96aeaf59286e7603b5c741c2056c1ac5f3d432dba7c931ae4cd5abf77af71924e0d043a8699200ac3737c53e91d207770e6d3e98999
HEAD_REF master
)

View File

@ -1,6 +1,6 @@
{
"name": "cgal",
"version": "5.5.1",
"version": "5.5.2",
"description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.",
"homepage": "https://github.com/CGAL/cgal",
"license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0",

View File

@ -1,8 +1,6 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a9724e..95d4d7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,12 +99,14 @@ find_package(Boost REQUIRED COMPONENTS
--- 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)
@ -17,5 +15,9 @@ index 2a9724e..95d4d7e 100644
+find_package(metis CONFIG REQUIRED)
+set(METIS_LIBRARIES metis)
find_package(Glog REQUIRED)
-find_package(Glog REQUIRED)
+find_package(glog CONFIG REQUIRED)
+set(GLOG_LIBRARIES glog::glog)
find_package(SQLite3 REQUIRED)

View File

@ -1,6 +1,7 @@
{
"name": "colmap",
"version-date": "2023-03-12",
"port-version": 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

@ -1429,7 +1429,7 @@
"port-version": 3
},
"cgal": {
"baseline": "5.5.1",
"baseline": "5.5.2",
"port-version": 0
},
"cgicc": {
@ -1646,7 +1646,7 @@
},
"colmap": {
"baseline": "2023-03-12",
"port-version": 0
"port-version": 1
},
"color-console": {
"baseline": "2022-03-20",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ddfb9d5fd8c8cd1a799af276c972b376f35f1267",
"version": "5.5.2",
"port-version": 0
},
{
"git-tree": "c86a34d296e485658d16306521425545f3e625ab",
"version": "5.5.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "be5a8b2aa2354b0d3aec03253dcd13358ba950da",
"version-date": "2023-03-12",
"port-version": 1
},
{
"git-tree": "31fb7f3106b019ceca3838a9461d372244125f63",
"version-date": "2023-03-12",