Skip to content

[cgal] update to 6.1 #47156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 9 commits into from
Nov 13, 2025
Merged

[cgal] update to 6.1 #47156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
af400a6
update to 6.1-beta1
lrineau Sep 1, 2025
a1ba6f2
update versions
lrineau Sep 1, 2025
5407b9c
cleanup the baseline failures
lrineau Sep 1, 2025
5be0ddf
fix the requirements
lrineau Sep 1, 2025
4788e1e
update versions
lrineau Sep 1, 2025
cbce450
update to CGAL version 6.1 (final version)
lrineau Nov 13, 2025
8c5fee9
./vcpkg x-add-version --all
lrineau Nov 13, 2025
935257e
Merge branch 'master' into cgal-6.1
lrineau Nov 13, 2025
86a8bbf
cleanup the versions (only the release and not the beta)
lrineau Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/cgal/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CGAL/cgal
REF v${VERSION}
SHA512 28963cdbf84d516290da69ca2ad5c90ec61dd9ca9cd97643ccf5b553c406e96a82621270214c0c81c32da7f8c388090a304d229925ed6e1548dbce3abcf1a259
SHA512 6519fc7bb73a5c608fab0ce867766ce8bbac9fef75347dfc49937bab08de7de6836730019c52f1717e569fe76e0a6c48b18b1e9d0349617220138fd0380c3a02
HEAD_REF master
)
vcpkg_cmake_configure(
Expand Down
3 changes: 2 additions & 1 deletion ports/cgal/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cgal",
"version": "6.0.1",
"version": "6.1",
"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",
Expand Down Expand Up @@ -43,6 +43,7 @@
"boost-range",
"boost-serialization",
"boost-spirit",
"boost-stl-interfaces",
"boost-thread",
"boost-tuple",
"boost-type-traits",
Expand Down
8 changes: 1 addition & 7 deletions scripts/ci.feature.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,11 +425,7 @@ cairomm:arm64-uwp = cascade
cairomm:x64-uwp = cascade
cartographer:arm64-uwp = cascade
cartographer:x64-uwp = cascade
cgal:arm64-uwp = cascade
cgal:x64-uwp = cascade
cgal[qt]:arm64-windows = cascade
cgal[qt]:x64-windows = cascade
cgal[qt]:x86-windows = cascade
cctz:arm64-uwp = cascade
cgns[hdf5,mpi](uwp) = cascade
clblas:arm-neon-android=fail
clblas:arm64-android=fail
Expand Down Expand Up @@ -974,8 +970,6 @@ libice:arm64-uwp = cascade
libice:x64-uwp = cascade
libideviceactivation:arm64-uwp = cascade
libideviceactivation:x64-uwp = cascade
libigl[cgal,embree,glfw,imgui,opengl,png]:arm64-uwp = cascade
Copy link
Member

@BillyONeal BillyONeal Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was missed in fef715d#diff-576de6f9b7378c44850cb8e307574d251f259f98b414bfecf1c2ead8b50c68a2R8

.... though with this change installing that passes for me. Strange

Copy link
Contributor Author

@lrineau lrineau Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Billy. Does libigl compile correctly?

Copy link
Member

@BillyONeal BillyONeal Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Billy. Does libigl compile correctly?

It installs headers correctly but not everything works: #48278 (comment)

No change requested as a result. Sorry for my confusion!

libigl[cgal,embree,glfw,imgui,opengl,png]:x64-uwp = cascade
libigl[embree]:arm64-windows = cascade
libimobiledevice:arm64-uwp = cascade
libimobiledevice:x64-uwp = cascade
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1665,7 +1665,7 @@
"port-version": 6
},
"cgal": {
"baseline": "6.0.1",
"baseline": "6.1",
"port-version": 0
},
"cgicc": {
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cgal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d1ff549f83dfbe8870ddca8ae5990f206c412185",
"version": "6.1",
"port-version": 0
},
{
"git-tree": "72f95d74f101763f740375bfecc249c096e9ff58",
"version": "6.0.1",
Expand Down