Skip to content

compatibility with CGAL 6.0 #214

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

compatibility with CGAL 6.0 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ FIND_PACKAGE(Eigen3 REQUIRED)
include_directories(${EIGEN3_INCLUDE_DIR})

FIND_PACKAGE(CGAL REQUIRED)
include(${CGAL_USE_FILE})

FILE(GLOB pygalmesh_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
# FILE(GLOB pygalmesh_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")

pybind11_add_module(pygalmesh ${pygalmesh_SRCS})

# ADD_LIBRARY(pygalmesh ${pygalmesh_SRCS})
target_link_libraries(pygalmesh PRIVATE ${CGAL_LIBRARIES})
target_link_libraries(pygalmesh PRIVATE CGAL::CGAL)

# https://github.com/CGAL/cgal/issues/6002
# find_program(iwyu_path NAMES include-what-you-use iwyu REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion src/generate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <CGAL/Mesh_complex_3_in_triangulation_3.h>
#include <CGAL/Mesh_criteria_3.h>

#include <CGAL/Implicit_mesh_domain_3.h>
#include <CGAL/Labeled_mesh_domain_3.h>
#include <CGAL/Mesh_domain_with_polyline_features_3.h>
#include <CGAL/make_mesh_3.h>

Expand Down
2 changes: 1 addition & 1 deletion src/generate_from_inr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <CGAL/Mesh_complex_3_in_triangulation_3.h>
#include <CGAL/Mesh_criteria_3.h>

#include <CGAL/Implicit_mesh_domain_3.h>
#include <CGAL/Labeled_mesh_domain_3.h>
#include <CGAL/Mesh_domain_with_polyline_features_3.h>
#include <CGAL/make_mesh_3.h>

Expand Down
4 changes: 2 additions & 2 deletions src/generate_from_off.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <CGAL/version_macros.h>

#if CGAL_VERSION_MAJOR >= 5 && CGAL_VERSION_MINOR < 3
#if (CGAL_VERSION_MAJOR == 5 && CGAL_VERSION_MINOR < 3)
#include <CGAL/IO/OFF_reader.h>
#endif

Expand Down Expand Up @@ -78,7 +78,7 @@ void generate_from_off(

if(
!input ||
#if CGAL_VERSION_MAJOR >= 5 && CGAL_VERSION_MINOR >= 3
#if (CGAL_VERSION_MAJOR >= 5 && CGAL_VERSION_MINOR >= 3) || (CGAL_VERSION_MAJOR >= 6)
!CGAL::IO::read_OFF(input, points, polygons) ||
#else
!CGAL::read_OFF(input, points, polygons) ||
Expand Down