aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime GIMENO <maxime.gimeno@gmail.com>2021-01-15 22:12:42 +0100
committerGitHub <noreply@github.com>2021-01-15 13:12:42 -0800
commita1843955822365381e1e0f922f27e86cfe3bf0e3 (patch)
tree627fb3dec75f52f5803b33cb92b8d8390fc5e718
parent4f8fb510ba03f195a49f6353b97fabf5bb20d450 (diff)
downloadvcpkg-a1843955822365381e1e0f922f27e86cfe3bf0e3.tar.gz
vcpkg-a1843955822365381e1e0f922f27e86cfe3bf0e3.zip
[CGAL] Upgrade to 5.2 (#15047)
* UPgrade to 5.2-beta1 * Upgrade to 5.2 * Merge from master Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
-rw-r--r--port_versions/baseline.json2
-rw-r--r--port_versions/c-/cgal.json5
-rw-r--r--ports/cgal/CONTROL2
-rw-r--r--ports/cgal/portfile.cmake6
4 files changed, 10 insertions, 5 deletions
diff --git a/port_versions/baseline.json b/port_versions/baseline.json
index d304104c5..0f246916c 100644
--- a/port_versions/baseline.json
+++ b/port_versions/baseline.json
@@ -1117,7 +1117,7 @@
"port-version": 0
},
"cgal": {
- "baseline": "5.1.1",
+ "baseline": "5.2",
"port-version": 0
},
"cgicc": {
diff --git a/port_versions/c-/cgal.json b/port_versions/c-/cgal.json
index 0052d73fd..ed0be54bc 100644
--- a/port_versions/c-/cgal.json
+++ b/port_versions/c-/cgal.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "1673f680f59b2c8c848a28c8e664b68b2ec182d7",
+ "version-string": "5.2",
+ "port-version": 0
+ },
+ {
"git-tree": "1618e4fdb8df228e557d622d97e766059e02a97a",
"version-string": "5.1.1",
"port-version": 0
diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL
index 07a07942a..ee652aea0 100644
--- a/ports/cgal/CONTROL
+++ b/ports/cgal/CONTROL
@@ -1,5 +1,5 @@
Source: cgal
-Version: 5.1.1
+Version: 5.2
Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-ptr-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision, boost-interval
Homepage: https://github.com/CGAL/cgal
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.
diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake
index 300b2a3d3..8e306608e 100644
--- a/ports/cgal/portfile.cmake
+++ b/ports/cgal/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CGAL/cgal
- REF v5.1.1
- SHA512 e1a56332269d1386afb6ffea51193800235292094ba160f138532246f6c2232ef104df319b4e8b0540953cb682a6687426b8b108a330604cbfcb6c119b01d97a
+ REF v5.2
+ SHA512 09f46c531365697968a9d9521eb9f3b5af5da9971be7fa86db990199f046c5a16dec821ca8a8ce1a2619b3ec44634e7426e39e997e8df783aa13552bc3d86064
HEAD_REF master
)
@@ -48,7 +48,7 @@ file(INSTALL ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_
file(
COPY
${SOURCE_PATH}/Installation/LICENSE.BSL
- ${SOURCE_PATH}/Installation/LICENSE.FREE_USE
+ ${SOURCE_PATH}/Installation/LICENSE.RFL
${SOURCE_PATH}/Installation/LICENSE.GPL
${SOURCE_PATH}/Installation/LICENSE.LGPL
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}