Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sfcgal for openSUSE:Factory checked in at 2026-03-13 21:18:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sfcgal (Old) and /work/SRC/openSUSE:Factory/.sfcgal.new.8177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sfcgal" Fri Mar 13 21:18:25 2026 rev:9 rq:1338714 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sfcgal/sfcgal.changes 2025-09-30 17:49:15.406621687 +0200 +++ /work/SRC/openSUSE:Factory/.sfcgal.new.8177/sfcgal.changes 2026-03-13 21:22:20.739059810 +0100 @@ -1,0 +2,182 @@ +Thu Feb 26 16:57:03 UTC 2026 - Bruno Friedmann <[email protected]> + +- add upstream patch 647.patch fix(examples): Add missing cgal target link library +- add withexample and withtest macro +- add new buildrequires gmp,eigen3,xz,nlohmann_json +- removed old test binaries +- add cmake files + +------------------------------------------------------------------- +Sat Nov 8 20:00:24 UTC 2025 - Bruno Friedmann <[email protected]> + +- Update to version 2.2.0 (2025-07-31): + + New Features (Feat) + - !455: feat(Simplification): Add a wrapper around CGAL 2D simplification (Loïc Bartoletti) + - !383: feat(cmake config): add a modern CMake Find (Loïc Bartoletti) + + Bug Fixes (Fix) + - !523: fix(Simplification): Add validitiy check (Loïc Bartoletti) + - !522: fix(Algorithm): Visibilty returns empty polygon if one input is empty (Loïc Bartoletti) + - !520: capi: fix missing @post documentation (Benoit D.-M.) + - !516: fix(StraightSkeleton): Return POLYHEDRALSURFACE EMPTY if input geometry is empty (Loïc Bartoletti) + - !511: Extrude Straigth Skeleton: Fix geometry validity removing roof bottom (Loïc Bartoletti) + - !510: fix(ci): Ignore deleted files in doxygen check (Jean Felder) + - !499: fix(intersection): handle multiple intersection points for segment-solid intersection (Loïc Bartoletti) + - !490: fix(capi): Mark sfcgal_triangulated_surface_add_triangle as deprecated (Jean Felder) + - !489: fix(centroid): Fix ignored attribute warning (Jean Felder) + - !483: fix(alphaShapes): handle missing optimal alpha iterator properly (Loïc Bartoletti) + - !480: fix(capi): Fix patches typo in documentation (Jean Felder) + - !479: fix(polyhedralsurface): Fix wrong variable name (Jean Felder) + - !478: fix(ci): Upload clang-tidy artifact on failure (Jean Felder) + - !477: fix(capi): Fix sfcgal_geometry_alpha_wrapping_3d documentation (Jean Felder) + - !474: fix(triangulatedsurface): Use correct plural form for patch (Jean Felder) + - !461: Treat PolyhedralSurface and TriangulatedSurface as one geometry instead of a Collection of Polygons/Triangles (Jean Felder) + + Improvements (Improve/Update) + - !508: chore(release): Specify that the sonar file needs to be updated (Jean Felder) + - !506: refactor(Primitive-3D): Move sphere and cylinder to a dedicated primitive3d folder (Loïc Bartoletti) + - !496: docker: Add missing files to compile (Jean Felder) + - !493: refactor: Use " instead of <> for SFCGAL header (Loïc Bartoletti) + + Continuous Integration (CI) + - !503: chore(ci): Allow failure of the windows jobs (Jean Felder) + - !500: chore(ci): Add a job to build latest macos version as a brew package (Jean Felder) + - !495: ci and pre-commit: Apply clang-format on the test directory too (Jean Felder) + - !492: Add CI markdown (Loïc Bartoletti) + - !491: chore(ci): Also test fedora 42 (Jean Felder) + - !488: chore: replace CI_COMMIT_REF_NAME var by %{source_branch} in MR template (Benoit D.-M.) + - !484: chore(BSD CI): Use Github actions (Loïc Bartoletti) + - !482: chore(ci): Improve doxygen config file to avoid false positives (Jean Felder) + - !476: ci: check doxygen warnings (Jean Felder) + + Documentation (Docs) + - !481: Capi doc fixes (Jean Felder) + - !473: capi: force the value of CGAL error behaviour to THROW_EXCEPTION in sfcgal_init() (Benoit D.-M.) + + Tests (Tests) + - !515: sfcgal-config: Define CMAKE_INSTALL_FULL_LIBDIR if not defined and add unit test for sfcgal-config --libs (Loïc Bartoletti) + - !502: chore(clang-tidy): Disable readability-magic-numbers check in test (Jean Felder) + - !497: tests(bin): Do not install tests bin (Loïc Bartoletti) + - !487: tests(AlphaWrapping): Workaround for tests (Loïc Bartoletti) + + Chore / Maintenance (Chore) + - !518: build: Add an option to compile with thread sanitizer (Jean Felder) + - !514: chore(clang-tidy): Ignore use-trailing-return-type warning in capi (Jean Felder) + - !512: chore(build): Post release bump version (Jean Felder) + - !509: chore(sonar): Bump version number to 2.1.0 (Jean Felder) + - !507: chore(ci): Fix gitlab pages deploy job (Jean Felder) + - !505: chore(clang-tidy): Ignore some default names in readability-identifier-length (Jean Felder) + - !504: chore(sfcgal_cTest): Fix clang-tidy warnings (Jean Felder) + - !494: style: apply clang-format to example and test (Loïc Bartoletti) + - !485: chore(MR): Add template (Loïc Bartoletti) + - !475: chore(2.1.0): Prepare 2.1.0. Add NEWS (Loïc Bartoletti) + - !462: chore: add commitizen to the project (Jean Felder) + + Misc + - !521: Fix license years (Loïc Bartoletti) + - !517: Ensure that all source files contain copyright and license info (Jean Felder) + - !501: IO: Add STL export (Loïc Bartoletti) + - !498: Added square logo for SFCGAL (Sylvain Beorchia) + - !486: Workaround for alpha wrapping segfault with gcc 15.1 (Jean Felder) + - !384: Nix cmake (Loïc Bartoletti) +- update to version 2.1.0 (2025-05-14): + + New Features (Feat) + - !464: Add a new Segment class (Loïc Bartoletti) + - !463: Add a const ESPILON=1e-8 and use it (Loïc Bartoletti) + - !461: Treat PolyhedralSurface and TriangulatedSurface as one geometry instead of a Collection of Polygons/Triangles (Jean Felder) + - !459: Add sfcgal_geometry_force_m (Jean Felder) + - !458: Add sfcgal_geometry_force_z (Jean Felder) + - !457: Add support for swapXY (Jean Felder) + - !455: Add a wrapper around CGAL 2D simplification (Loïc Bartoletti) + - !452: Add sfcgal_geometry_boundary (Jean Felder) + - !451: Add support for sfcgal_geometry_type (Jean Felder) + - !449: Add sfcgal_geometry_dimension (Jean Felder) + - !448: Add support for geometry::dropM (Jean Felder) + - !447: Add support for geometry::dropZ (Jean Felder) + - !433: Add sfcgal_geometry_is_equals function (Benoit De Mezzo) + - !423: Add Centroid algorithm and apic (Benoit De Mezzo) + - !421: Add sfcgal_geometry_length functions (Benoit De Mezzo) + - !419: Add a setGeometryN method (Jean Felder) + - !413: Add sfcgal_delete_buffer (Benoit De Mezzo) + - !398: Add 3D Alpha Wrapping algorithm (Jean Felder) + - !390: Add a method to set the external shell (Jean Felder) + - !383: Add a modern CMake Find (Loïc Bartoletti) + - !382: Add isSimple method for geometries (Raphael Delhome) + + Bug Fixes (Fix) + - !489: Fix ignored attribute warning (centroid) (Jean Felder) + - !486: Workaround for alpha wrapping segfault with gcc 15.1 (Jean Felder) + - !483: handle missing optimal alpha iterator properly (Loïc Bartoletti) + - !479: Fix wrong variable name for PolyhedralSurface (Jean Felder) + - !474: Use correct plural form for patch in triangulatedsurface (Jean Felder) + - !472: Fix constructor to avoid Kernel::FT creation when z is NaN (Benoit De Mezzo) + - !470: Make const the "geom" param of sfcgal_geometry_simplify (Benoit De Mezzo) + - !467: Enforce ring order and apply NoValidityCheck in Partition (Loïc Bartoletti) + - !466: Return PolyhedralSurface instead of MultiPolygon in StraightSkeletonPartition (Loïc Bartoletti) + - !456: Fix typo in triangle test (Jean Felder) + - !454: Make translate geom parameter const (Jean Felder) + - !450: Improve sfcgal_geometry_covers documentation (Jean Felder) + - !445: Add missing override in geometrycollection (Jean Felder) + - !444: Use sfcgal exception everywhere (Jean Felder) + - !440: Throw an error in geometryN in case of failure (Jean Felder) + - !438: Add missing override to the different geometry classes (Jean Felder) + - !435: Remove default value for sfcgal_geometry_is_almost_equals (Jean Felder) + - !434: Fix deprecated usage in capi (Jean Felder) + - !430: Improve buffer allocations, checks and set default content (Benoit De Mezzo) + - !429: Fix numGeometries for atomic empty geometries (Jean Felder) + - !420: Split sfcgal_geometry_envelope function in 2D/3D variants (Benoit De Mezzo) + - !418: Misc alpha wrapping fixes follow up (Jean Felder) + - !415: Fix typo in SFCGAL_VALGRIND (Jean Felder) + - !414: Fix typo in sfcgal_set_alloc_handlers documentation (Jean Felder) + - !409: Fix geometry memory leaks in C API unit tests (Jean Felder) + - !406: Fix a typo and bump standard version (Loïc Bartoletti) + - !402: Fix typo in wkbreader (Jean Felder) + - !400: Fix a segfault in exterior shell unit test (Jean Felder) + - !395: Fix some compilation warning (Jean Felder) + - !388: Fix error message in addGeometry for GeometryCollection (Jean Felder) + - !381: Buffer3d should not accept segments=3 (Raphael Delhome) + - !378: Remove unused variable is_first in buffer3d (Jean Felder) + + Improvements (Improve/Update) + - !490: Mark sfcgal_triangulated_surface_add_triangle as deprecated (Jean Felder) + - !488: replace CI_COMMIT_REF_NAME var by %{source_branch} in MR template (Benoit De Mezzo) + - !485: Add MR template (Loïc Bartoletti) + - !469: Remove unused preserveTopology in Simplification (Loïc Bartoletti) + - !468: Remove unused Z value and useless dimension code in SegmentStore (Loïc Bartoletti) + - !465: Update clang-format to version 19 (Jean Felder) + - !453: Explain sfcgal_geometry_buffer3d memory management (Jean Felder) + - !442: Fix some ci pipelines (Jean Felder) + - !436: Add a test to check that the c api works (Jean Felder) + - !432: Rework code documentation (Benoit De Mezzo) + - !424: Update badge URL (Raphael Delhome) + - !422: Add missing tests for apic (Benoit De Mezzo) + - !412: Improve explanation about test executions (Benoit De Mezzo) + - !411: Improve support for valgrind (Benoit De Mezzo) + - !408: Add missing function to api C (Benoit De Mezzo) + - !407: Fix links (Loïc Bartoletti) + - !405: Minor documentation fixes improvements (Ju M) + - !403: Remove redundant Boost_USE_STATIC_LIBS=OFF setting (Loïc Bartoletti) + - !380: The buffer3d type name should be uppercase (Raphael Delhome) + - !379: Some improvements in the doc (Florent Fougères) + + Continuous Integration (CI) + - !492: Add CI Markdown (Loïc Bartoletti) + - !491: Test Fedora 42 (Jean Felder) + - !484: Use Github actions for FreeBSD, NetBSD, OpenBSD and macOS CI (Loïc Bartoletti) + - !482: Improve doxygen config file to avoid false positives (Jean Felder) + - !478: Upload clang-tidy artifact on failure (Jean Felder) + - !476: check doxygen warnings (Jean Felder) + - !460: Init 2.1.0 (Loïc Bartoletti) + - !439: Bump FreeBSD to 14.2 and remove 13.3 (Loïc Bartoletti) + - !428: Ignore vcpkg.json in gitlab CI (Jean Felder) + - !416: Update runner and add linux and macos for vcpkg (Loïc Bartoletti) + - !410: Fix debian clang testing ci (Jean Felder) + - !404: Bump macOs image to sonoma (Loïc Bartoletti) + - !401: Renable parallalize build (Jean Felder) + - !394: Use all procs for the build jobs (Jean Felder) + - !389: Bump CGAL versions to 5.6.2 and 6.0.1 (Loïc Bartoletti) + - !387: Upgrade clang-format from 15 to 16 in the CI (Raphael Delhome) + - !385: Ensure to use the .clang-format configuration file (Jean Felder) + - !384: Nix cmake (Loïc Bartoletti) + - !377: Pages and build:documentation need to have the same limitations (Jean Felder) + - !376: Declare dependencies for docker deploy jobs (Jean Felder) + - !375: Declare dependencies for docker deploy jobs (Jean Felder) + + Documentation (Docs) + - !481: Capi doc fixes (Jean Felder) + - !480: Fix patches typo in documentation (capi) (Jean Felder) + - !477: Fix sfcgal_geometry_alpha_wrapping_3d documentation (Jean Felder) + + Tests (Tests) + - !487: Workaround for AlphaWrapping tests (Loïc Bartoletti) +- renew boost.patch + +------------------------------------------------------------------- Old: ---- SFCGAL-v2.0.0.tar.bz2 New: ---- 647.patch SFCGAL-v2.2.0.tar.bz2 ----------(New B)---------- New: - add upstream patch 647.patch fix(examples): Add missing cgal target link library - add withexample and withtest macro ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sfcgal.spec ++++++ --- /var/tmp/diff_new_pack.yqwKhr/_old 2026-03-13 21:22:21.375086166 +0100 +++ /var/tmp/diff_new_pack.yqwKhr/_new 2026-03-13 21:22:21.375086166 +0100 @@ -1,7 +1,7 @@ # # spec file for package sfcgal # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # Copyright (c) 2025 Ioda-Net Sàrl, Charmoille, Switzerland. Bruno Friedmann (tigerfoot) # # All modifications and additions to the file contributed by third parties @@ -24,17 +24,20 @@ # and https://gitlab.com/Oslandia/SFCGAL/-/issues/258 are pending. # this force postgis ix86 to be build without sfcgal. ExcludeArch: %{ix86} +%define withexamples 0 %ifarch %{ix86} x86_64 %define withosgd 1 +%define withtest 1 BuildRequires: pkgconfig(openscenegraph) %else # openscenegraph not available for # s390x ppc64le ppc64 aarch64 armv7l # dummy %define withosgd 0 +%define withtest 0 %endif Name: sfcgal -Version: 2.0.0 +Version: 2.2.0 Release: 0 Summary: C++ wrapper library around CGAL License: LGPL-2.0-or-later @@ -42,7 +45,10 @@ URL: https://sfcgal.gitlab.io/SFCGAL/ Source0: https://gitlab.com/sfcgal/SFCGAL/-/archive/v%{version}/SFCGAL-v%{version}.tar.bz2 Patch0: boost.patch +# PATCH-FIX-UPSTREAM fix(examples): Add missing cgal target link library - https://gitlab.com/sfcgal/SFCGAL/-/merge_requests/647 +Patch1: 647.patch BuildRequires: cmake +BuildRequires: eigen3-devel BuildRequires: gmp-devel BuildRequires: lapack-devel BuildRequires: libboost_chrono-devel >= 1.72 @@ -58,13 +64,16 @@ BuildRequires: llvm-clang BuildRequires: memory-constraints BuildRequires: pkgconfig +BuildRequires: xz-devel BuildRequires: pkgconfig(cunit) BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(gmp) BuildRequires: pkgconfig(libecpg) >= 10 BuildRequires: pkgconfig(libecpg_compat) >= 10 BuildRequires: pkgconfig(libpgtypes) >= 10 BuildRequires: pkgconfig(libpq) >= 10 BuildRequires: pkgconfig(mpfr) +BuildRequires: pkgconfig(nlohmann_json) BuildRequires: pkgconfig(zlib) %description @@ -144,10 +153,18 @@ %else -DSFCGAL_WITH_OSG=OFF \ %endif +%if %{withexamples} -DSFCGAL_BUILD_EXAMPLES=ON \ +%else + -DSFCGAL_BUILD_EXAMPLES=OFF \ +%endif +%if %{withtest} -DSFCGAL_BUILD_TESTS=ON +%else + -DSFCGAL_BUILD_TESTS=OFF +%endif -%cmake_build +%cmake_build -v %install %cmake_install @@ -175,12 +192,10 @@ %files %license LICENSE %doc README.md AUTHORS NEWS +%if %{withexamples} %{_bindir}/example-CGAL-* %{_bindir}/example-SFCGAL-* -%{_bindir}/unit-test-SFCGAL -%{_bindir}/standalone-regress-test-SFCGAL -%{_bindir}/test-regress-convex_hull -%{_bindir}/test-regress-polygon_triangulator +%endif %files devel %license LICENSE @@ -190,6 +205,7 @@ %{_libdir}/libSFCGAL-osg.so %endif %{_libdir}/pkgconfig/sfcgal.pc +%{_libdir}/cmake/SFCGAL %{_includedir}/SFCGAL %{_bindir}/sfcgal-config ++++++ 647.patch ++++++ >From 6e5ab742bf8c173f4350d576aeac7fc8cd29a050 Mon Sep 17 00:00:00 2001 From: Jean Felder <[email protected]> Date: Mon, 22 Dec 2025 22:32:38 +0100 Subject: [PATCH 1/3] chore(examples): Remove trailing whitespaces --- example/CGAL-basic_manip/CMakeLists.txt | 4 ++-- example/CGAL-cartesian_kernel/CMakeLists.txt | 4 ++-- example/CGAL-point_generator/CMakeLists.txt | 4 ++-- example/CGAL-polygon_triangulation2/CMakeLists.txt | 4 ++-- example/CGAL-triangulation2/CMakeLists.txt | 4 ++-- example/SFCGAL-building/CMakeLists.txt | 5 ++--- example/SFCGAL-export-osg/CMakeLists.txt | 4 ++-- example/SFCGAL-offset/CMakeLists.txt | 4 ++-- 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/example/CGAL-basic_manip/CMakeLists.txt b/example/CGAL-basic_manip/CMakeLists.txt index 9b905e38..217aa645 100644 --- a/example/CGAL-basic_manip/CMakeLists.txt +++ b/example/CGAL-basic_manip/CMakeLists.txt @@ -1,6 +1,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME ) -add_executable( example-${EXAMPLE_NAME} - main.cpp +add_executable( example-${EXAMPLE_NAME} + main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) diff --git a/example/CGAL-cartesian_kernel/CMakeLists.txt b/example/CGAL-cartesian_kernel/CMakeLists.txt index 9b905e38..217aa645 100644 --- a/example/CGAL-cartesian_kernel/CMakeLists.txt +++ b/example/CGAL-cartesian_kernel/CMakeLists.txt @@ -1,6 +1,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME ) -add_executable( example-${EXAMPLE_NAME} - main.cpp +add_executable( example-${EXAMPLE_NAME} + main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) diff --git a/example/CGAL-point_generator/CMakeLists.txt b/example/CGAL-point_generator/CMakeLists.txt index 9b905e38..217aa645 100644 --- a/example/CGAL-point_generator/CMakeLists.txt +++ b/example/CGAL-point_generator/CMakeLists.txt @@ -1,6 +1,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME ) -add_executable( example-${EXAMPLE_NAME} - main.cpp +add_executable( example-${EXAMPLE_NAME} + main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) diff --git a/example/CGAL-polygon_triangulation2/CMakeLists.txt b/example/CGAL-polygon_triangulation2/CMakeLists.txt index 9b905e38..217aa645 100644 --- a/example/CGAL-polygon_triangulation2/CMakeLists.txt +++ b/example/CGAL-polygon_triangulation2/CMakeLists.txt @@ -1,6 +1,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME ) -add_executable( example-${EXAMPLE_NAME} - main.cpp +add_executable( example-${EXAMPLE_NAME} + main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) diff --git a/example/CGAL-triangulation2/CMakeLists.txt b/example/CGAL-triangulation2/CMakeLists.txt index 9b905e38..217aa645 100644 --- a/example/CGAL-triangulation2/CMakeLists.txt +++ b/example/CGAL-triangulation2/CMakeLists.txt @@ -1,6 +1,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME ) -add_executable( example-${EXAMPLE_NAME} - main.cpp +add_executable( example-${EXAMPLE_NAME} + main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) diff --git a/example/SFCGAL-building/CMakeLists.txt b/example/SFCGAL-building/CMakeLists.txt index de1784db..8337d3f0 100644 --- a/example/SFCGAL-building/CMakeLists.txt +++ b/example/SFCGAL-building/CMakeLists.txt @@ -1,8 +1,7 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME ) -add_executable( example-${EXAMPLE_NAME} - main.cpp +add_executable( example-${EXAMPLE_NAME} + main.cpp ) - find_package(Boost REQUIRED COMPONENTS serialization) target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES} SFCGAL-osg) set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" ) diff --git a/example/SFCGAL-export-osg/CMakeLists.txt b/example/SFCGAL-export-osg/CMakeLists.txt index 2a88c9d8..a7fd27d4 100644 --- a/example/SFCGAL-export-osg/CMakeLists.txt +++ b/example/SFCGAL-export-osg/CMakeLists.txt @@ -1,6 +1,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME ) -add_executable( example-${EXAMPLE_NAME} - main.cpp +add_executable( example-${EXAMPLE_NAME} + main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) target_link_libraries( example-${EXAMPLE_NAME} SFCGAL SFCGAL-osg ${Boost_LIBRARIES}) diff --git a/example/SFCGAL-offset/CMakeLists.txt b/example/SFCGAL-offset/CMakeLists.txt index 9b905e38..217aa645 100644 --- a/example/SFCGAL-offset/CMakeLists.txt +++ b/example/SFCGAL-offset/CMakeLists.txt @@ -1,6 +1,6 @@ GET_FILENAME_COMPONENT( EXAMPLE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME ) -add_executable( example-${EXAMPLE_NAME} - main.cpp +add_executable( example-${EXAMPLE_NAME} + main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) -- GitLab >From 10a0df86c55ec29d39bc3477073081c8f3639c09 Mon Sep 17 00:00:00 2001 From: Jean Felder <[email protected]> Date: Mon, 22 Dec 2025 22:33:43 +0100 Subject: [PATCH 2/3] fix(examples): Add missing cgal target link library Closes: https://gitlab.com/sfcgal/SFCGAL/-/issues/316 --- example/CGAL-basic_manip/CMakeLists.txt | 2 +- example/CGAL-cartesian_kernel/CMakeLists.txt | 2 +- example/CGAL-point_generator/CMakeLists.txt | 2 +- example/CGAL-polygon_triangulation2/CMakeLists.txt | 2 +- example/CGAL-triangulation2/CMakeLists.txt | 2 +- example/SFCGAL-building/CMakeLists.txt | 2 +- example/SFCGAL-export-osg/CMakeLists.txt | 2 +- example/SFCGAL-offset/CMakeLists.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/example/CGAL-basic_manip/CMakeLists.txt b/example/CGAL-basic_manip/CMakeLists.txt index 217aa645..90da9102 100644 --- a/example/CGAL-basic_manip/CMakeLists.txt +++ b/example/CGAL-basic_manip/CMakeLists.txt @@ -3,6 +3,6 @@ add_executable( example-${EXAMPLE_NAME} main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) -target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) +target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES}) set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" ) install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin ) diff --git a/example/CGAL-cartesian_kernel/CMakeLists.txt b/example/CGAL-cartesian_kernel/CMakeLists.txt index 217aa645..90da9102 100644 --- a/example/CGAL-cartesian_kernel/CMakeLists.txt +++ b/example/CGAL-cartesian_kernel/CMakeLists.txt @@ -3,6 +3,6 @@ add_executable( example-${EXAMPLE_NAME} main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) -target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) +target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES}) set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" ) install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin ) diff --git a/example/CGAL-point_generator/CMakeLists.txt b/example/CGAL-point_generator/CMakeLists.txt index 217aa645..90da9102 100644 --- a/example/CGAL-point_generator/CMakeLists.txt +++ b/example/CGAL-point_generator/CMakeLists.txt @@ -3,6 +3,6 @@ add_executable( example-${EXAMPLE_NAME} main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) -target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) +target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES}) set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" ) install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin ) diff --git a/example/CGAL-polygon_triangulation2/CMakeLists.txt b/example/CGAL-polygon_triangulation2/CMakeLists.txt index 217aa645..90da9102 100644 --- a/example/CGAL-polygon_triangulation2/CMakeLists.txt +++ b/example/CGAL-polygon_triangulation2/CMakeLists.txt @@ -3,6 +3,6 @@ add_executable( example-${EXAMPLE_NAME} main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) -target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) +target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES}) set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" ) install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin ) diff --git a/example/CGAL-triangulation2/CMakeLists.txt b/example/CGAL-triangulation2/CMakeLists.txt index 217aa645..90da9102 100644 --- a/example/CGAL-triangulation2/CMakeLists.txt +++ b/example/CGAL-triangulation2/CMakeLists.txt @@ -3,6 +3,6 @@ add_executable( example-${EXAMPLE_NAME} main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) -target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) +target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES}) set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" ) install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin ) diff --git a/example/SFCGAL-building/CMakeLists.txt b/example/SFCGAL-building/CMakeLists.txt index 8337d3f0..cebac48e 100644 --- a/example/SFCGAL-building/CMakeLists.txt +++ b/example/SFCGAL-building/CMakeLists.txt @@ -3,6 +3,6 @@ add_executable( example-${EXAMPLE_NAME} main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) -target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES} SFCGAL-osg) +target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} SFCGAL-osg) set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" ) install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin ) diff --git a/example/SFCGAL-export-osg/CMakeLists.txt b/example/SFCGAL-export-osg/CMakeLists.txt index a7fd27d4..90da9102 100644 --- a/example/SFCGAL-export-osg/CMakeLists.txt +++ b/example/SFCGAL-export-osg/CMakeLists.txt @@ -3,6 +3,6 @@ add_executable( example-${EXAMPLE_NAME} main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) -target_link_libraries( example-${EXAMPLE_NAME} SFCGAL SFCGAL-osg ${Boost_LIBRARIES}) +target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES}) set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" ) install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin ) diff --git a/example/SFCGAL-offset/CMakeLists.txt b/example/SFCGAL-offset/CMakeLists.txt index 217aa645..90da9102 100644 --- a/example/SFCGAL-offset/CMakeLists.txt +++ b/example/SFCGAL-offset/CMakeLists.txt @@ -3,6 +3,6 @@ add_executable( example-${EXAMPLE_NAME} main.cpp ) find_package(Boost REQUIRED COMPONENTS serialization) -target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${Boost_LIBRARIES}) +target_link_libraries( example-${EXAMPLE_NAME} SFCGAL ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES}) set_target_properties( example-${EXAMPLE_NAME} PROPERTIES DEBUG_POSTFIX "d" ) install( TARGETS example-${EXAMPLE_NAME} DESTINATION bin ) -- GitLab >From 24b879843c025160f81e61bcff18c87e67e85e90 Mon Sep 17 00:00:00 2001 From: Jean Felder <[email protected]> Date: Mon, 22 Dec 2025 22:40:48 +0100 Subject: [PATCH 3/3] chore(build/sonar): Activate examples compilation This allows to test their compilation. --- .gitlab/pipeline/sonar.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/pipeline/sonar.yml b/.gitlab/pipeline/sonar.yml index f46c8777..67ccfdd8 100644 --- a/.gitlab/pipeline/sonar.yml +++ b/.gitlab/pipeline/sonar.yml @@ -48,7 +48,7 @@ sonar:build-test: - ./ci/debian/before_install.sh $SONAR_CGAL_VERSION script: # prepare the build tree - - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -S . -B build -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON + - CGAL_DIR=$CI_PROJECT_DIR/CGAL cmake -S . -B build -DSFCGAL_BUILD_TESTS=ON -DSFCGAL_BUILD_EXAMPLES=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON # run the build inside the build wrapper - build-wrapper/build-wrapper-linux-x86-64 --out-dir bw-output cmake --build build/ --config Release - cd build -- GitLab ++++++ SFCGAL-v2.0.0.tar.bz2 -> SFCGAL-v2.2.0.tar.bz2 ++++++ ++++ 37079 lines of diff (skipped) ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.yqwKhr/_old 2026-03-13 21:22:22.595136722 +0100 +++ /var/tmp/diff_new_pack.yqwKhr/_new 2026-03-13 21:22:22.599136887 +0100 @@ -2,12 +2,12 @@ <constraints> <hardware> <memory> - <size unit="G">5</size> + <size unit="G">6</size> </memory> <!-- Cannot use the correct value, rejects too many workers otherwise. See spec file/limit_build --> <memoryperjob> - <size unit="M">1100</size> + <size unit="M">1200</size> </memoryperjob> </hardware> <sandbox>kvm</sandbox> ++++++ boost.patch ++++++ --- /var/tmp/diff_new_pack.yqwKhr/_old 2026-03-13 21:22:22.619137716 +0100 +++ /var/tmp/diff_new_pack.yqwKhr/_new 2026-03-13 21:22:22.623137882 +0100 @@ -1,12 +1,14 @@ ---- SFCGAL-v2.0.0/CMakeLists.txt.orig 2025-09-30 14:30:48.496502043 +0200 -+++ SFCGAL-v2.0.0/CMakeLists.txt 2025-09-30 14:30:58.034683913 +0200 -@@ -114,7 +114,7 @@ +diff -rup a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2025-07-31 09:00:01.000000000 +0200 ++++ b/CMakeLists.txt 2025-11-08 09:44:27.749158974 +0100 +@@ -134,7 +134,8 @@ else() endif() #-- minimalist build allowed with boost version older than 1.48 -set( SFCGAL_Boost_COMPONENTS thread system serialization ) ++#-- removed system which don't exist anymore in 1.89 +set( SFCGAL_Boost_COMPONENTS thread serialization ) - #-- unit test - if ( SFCGAL_BUILD_TESTS ) - set( SFCGAL_Boost_COMPONENTS unit_test_framework program_options ${SFCGAL_Boost_COMPONENTS} ) + #-- program_options + if ( SFCGAL_BUILD_TESTS OR SFCGAL_BUILD_EXAMPLES OR SFCGAL_BUILD_OSG ) + set( SFCGAL_Boost_COMPONENTS chrono unit_test_framework filesystem program_options timer ${SFCGAL_Boost_COMPONENTS} )
