Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions ports/cgal/usage
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,37 @@ The package cgal provides CMake targets:
find_package(CGAL CONFIG REQUIRED)
target_link_libraries(main PRIVATE CGAL::CGAL)

Each optional feature below requires linking its support target explicitly, per-target.
find_package() uses CONFIG REQUIRED: enabling one of these features guarantees the
dependency is installed, so treat it as mandatory rather than probing for it.

"eigen3":

find_package(Eigen3 CONFIG REQUIRED)
include(CGAL_Eigen3_support)
target_link_libraries(main PRIVATE CGAL::Eigen3_support)

"qt" ("qt-svg" needs no extra CMake, it's picked up automatically):

find_package(Qt6 CONFIG REQUIRED COMPONENTS OpenGL OpenGLWidgets Widgets OPTIONAL_COMPONENTS Svg)
include(CGAL_SetupCGAL_Qt6Dependencies)
target_link_libraries(main PRIVATE Qt6::Widgets CGAL::Qt6_moc_and_resources Qt6::OpenGLWidgets)
CGAL_setup_CGAL_Qt6_dependencies(main)

"tbb":

find_package(TBB CONFIG REQUIRED)
include(CGAL_TBB_support)
target_link_libraries(main PRIVATE CGAL::TBB_support)

"ceres":

find_package(Ceres CONFIG REQUIRED)
include(CGAL_Ceres_support)
target_link_libraries(main PRIVATE CGAL::Ceres_support)

"openmesh":

find_package(OpenMesh CONFIG REQUIRED)
include(CGAL_OpenMesh_support)
target_link_libraries(main PRIVATE CGAL::OpenMesh_support)
48 changes: 43 additions & 5 deletions ports/cgal/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "cgal",
"version": "6.2",
"port-version": 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",
"license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0 AND MIT",
"supports": "!xbox",
"dependencies": [
"boost-accumulators",
Expand Down Expand Up @@ -63,17 +64,54 @@
"zlib"
],
"features": {
"ceres": {
"description": "Ceres Solver integration for nonlinear least-squares optimization in mesh processing algorithms",
"dependencies": [
"ceres"
]
},
"eigen3": {
"description": "Eigen3 library integration",
"dependencies": [
"eigen3"
]
},
"openmesh": {
"description": "OpenMesh library integration",
"dependencies": [
"openmesh"
]
},
"qt": {
"description": "Qt GUI support for CGAL",
"description": "Qt GUI support",
"dependencies": [
"eigen3",
{
"name": "qtbase",
"default-features": false
"default-features": false,
"features": [
"widgets"
]
}
]
},
"qt-svg": {
"description": "SVG icon support for the Qt GUI feature",
"dependencies": [
{
"name": "cgal",
"default-features": false,
"features": [
"qt"
]
},
"qtdeclarative",
"qtsvg"
]
},
"tbb": {
"description": "Intel TBB support for parallel algorithms",
"dependencies": [
"tbb"
]
}
}
}
1 change: 1 addition & 0 deletions scripts/ci.feature.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ ceres[cuda]:arm64-linux=cascade
ceres[lapack]:arm64-linux=cascade
ceres[suitesparse]:arm64-linux=cascade
cgal[qt]:arm64-linux=cascade
cgal[qt-svg]:arm64-linux=cascade
cgns[core,fortran,hdf5,legacy,lfs,mpi,tests](osx | (linux&!arm64))=combination-fails # ["fortran","hdf5","mpi"]: Could NOT find MPI (missing: MPI_Fortran_FOUND) (found version "3.1")
cgns[fortran]:arm64-linux=feature-fails
cgns[fortran](windows | android)=feature-fails # No fortran compiler installed
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1690,7 +1690,7 @@
},
"cgal": {
"baseline": "6.2",
"port-version": 0
"port-version": 1
},
"cgicc": {
"baseline": "3.2.20",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cgal.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b462c716943d128187e489730bcb2a7292b76953",
"version": "6.2",
"port-version": 1
},
{
"git-tree": "ee44afa940e03a2edfb5bf1576952aff668a2e2a",
"version": "6.2",
Expand Down
Loading