songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cgal/5.2.x-branch' into CGAL-remove_bind

This commit is contained in:
Sébastien Loriot 2021-01-29 18:44:50 +01:00
parent 5311c150f5 247c965a71
commit f69be333f0
132 changed files with 485 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/install.sh vendored
View File

@ -3,7 +3,7 @@ sudo add-apt-repository ppa:mikhailnov/pulseeffects -y
sudo apt-get update
sudo apt-get install -y libmpfr-dev \
libeigen3-dev qtbase5-dev libqt5sql5-sqlite libqt5opengl5-dev qtscript5-dev \
libqt5svg5-dev qttools5-dev qttools5-dev-tools libboost1.72-dev
libqt5svg5-dev qttools5-dev qttools5-dev-tools libboost1.72-dev zsh
#update cmake to 3.18.4
sudo apt purge --auto-remove cmake
cd /tmp

30
.github/workflows/checks.yml vendored Normal file
View File

@ -0,0 +1,30 @@
name: CMake Test Merge Branch
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.0.0
- name: install dependencies
run: |
.github/install.sh
set -x
sudo apt-get update && sudo apt-get install -y graphviz ssh bibtex2html
sudo pip install lxml
sudo pip install 'pyquery==1.4.1' # it seems to be the last py2 compatible version
wget --no-verbose -O doxygen_exe https://cgal.geometryfactory.com/~mgimeno/doxygen/build_1_8_13/bin/doxygen
sudo mv doxygen_exe /usr/bin/doxygen
sudo chmod +x /usr/bin/doxygen
git config --global user.email "maxime.gimeno@geometryfactory.com"
git config --global user.name "Maxime Gimeno"
- name: Run checks
run: |
zsh Scripts/developer_scripts/test_merge_of_branch HEAD
#test dependencies
bash Scripts/developer_scripts/cgal_check_dependencies.sh --check_headers /usr/bin/doxygen

2
.github/workflows/demo.yml vendored
View File

@ -1,6 +1,6 @@
name: Test Polyhedron Demo
on: [pull_request]
on: [push, pull_request]
jobs:
batch_1:

1
Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies
View File

@ -4,7 +4,6 @@ Arithmetic_kernel
Cartesian_kernel
Circulator
Filtered_kernel
Geomview
Hash_map
Homogeneous_kernel
Installation

2
Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_polycurve_intersection.cpp
View File

@ -3,7 +3,7 @@
#include <CGAL/Arr_polyline_traits_2.h>
#include <CGAL/Arrangement_2.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <array>

2
BGL/include/CGAL/boost/graph/copy_face_graph.h
View File

@ -25,7 +25,7 @@
#include <CGAL/property_map.h>
#include <boost/unordered_map.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
namespace CGAL {

6
BGL/package_info/BGL/dependencies
View File

@ -1,19 +1,13 @@
Algebraic_foundations
Arithmetic_kernel
BGL
Cartesian_kernel
Circulator
Distance_2
Distance_3
Filtered_kernel
Hash_map
Homogeneous_kernel
Installation
Intersections_2
Intersections_3
Interval_support
Kernel_23
Kernel_d
Modular_arithmetic
Number_types
Profiling_tools

8
Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt
View File

@ -5,7 +5,7 @@ find_package(CGAL REQUIRED)
# Use Eigen
find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
# create a target per cppfile
file(
@ -13,11 +13,11 @@ file(
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
foreach(cppfile ${cppfiles})
if(NOT (${cppfile} STREQUAL "ellipsoid.cpp") OR TARGET CGAL::Eigen_support)
if(NOT (${cppfile} STREQUAL "ellipsoid.cpp") OR TARGET CGAL::Eigen3_support)
get_filename_component(target ${cppfile} NAME_WE)
add_executable(${target} ${cppfile})
if(TARGET CGAL::Eigen_support)
target_link_libraries(${target} CGAL::CGAL CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
target_link_libraries(${target} CGAL::CGAL CGAL::Eigen3_support)
else()
target_link_libraries(${target} CGAL::CGAL)
endif()

8
Bounding_volumes/test/Bounding_volumes/CMakeLists.txt
View File

@ -10,7 +10,7 @@ include(${CGAL_USE_FILE})
# Use Eigen
find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
# create a target per cppfile
file(
@ -19,11 +19,11 @@ file(
${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
foreach(cppfile ${cppfiles})
if(NOT (${cppfile} STREQUAL "Approximate_min_ellipsoid_d.cpp")
OR TARGET CGAL::Eigen_support)
OR TARGET CGAL::Eigen3_support)
get_filename_component(target ${cppfile} NAME_WE)
add_executable(${target} ${cppfile})
if(TARGET CGAL::Eigen_support)
target_link_libraries(${target} CGAL::CGAL CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
target_link_libraries(${target} CGAL::CGAL CGAL::Eigen3_support)
else()
target_link_libraries(${target} CGAL::CGAL)
endif()

10
CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
View File

@ -23,8 +23,8 @@ find_package(CGAL REQUIRED COMPONENTS Core)
include(${CGAL_USE_FILE})
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS
"NOTICE: This project requires the Eigen library, and will not be compiled."
@ -147,7 +147,7 @@ if(IPE_FOUND AND IPE_VERSION)
foreach(IPELET ${CGAL_IPELETS})
add_library(CGAL_${IPELET} MODULE ${IPELET}.cpp)
add_to_cached_list(CGAL_EXECUTABLE_TARGETS CGAL_${IPELET})
target_link_libraries(CGAL_${IPELET} PRIVATE CGAL::CGAL CGAL::Eigen_support
target_link_libraries(CGAL_${IPELET} PRIVATE CGAL::CGAL CGAL::Eigen3_support
${IPE_LIBRARIES})
if(IPELET_INSTALL_DIR)
install(TARGETS CGAL_${IPELET} DESTINATION ${IPELET_INSTALL_DIR})
@ -160,12 +160,12 @@ if(IPE_FOUND AND IPE_VERSION)
endforeach(IPELET)
if(CGAL_Core_FOUND)
target_link_libraries(CGAL_cone_spanners PRIVATE CGAL::CGAL_Core
CGAL::Eigen_support)
CGAL::Eigen3_support)
endif()
#example in doc not installed
add_library(simple_triangulation MODULE simple_triangulation.cpp)
add_to_cached_list(CGAL_EXECUTABLE_TARGETS simple_triangulation)
target_link_libraries(simple_triangulation CGAL::Eigen_support
target_link_libraries(simple_triangulation CGAL::Eigen3_support
${IPE_LIBRARIES})
cgal_add_compilation_test(simple_triangulation)

2
CGAL_ipelets/include/CGAL/grabbers.h
View File

@ -14,7 +14,7 @@
#ifndef CGAL_GRABBER_H
#define CGAL_GRABBER_H
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
namespace CGAL{

6
Classification/examples/Classification/CMakeLists.txt
View File

@ -56,8 +56,8 @@ if(NOT TARGET CGAL::TensorFlow_support)
endif()
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS "This project requires the Eigen library, and will not be compiled.")
set(Classification_dependencies_met FALSE)
@ -105,7 +105,7 @@ foreach(target
example_deprecated_conversion)
if(TARGET ${target})
target_link_libraries(
${target} PUBLIC CGAL::Eigen_support CGAL::Boost_iostreams_support
${target} PUBLIC CGAL::Eigen3_support CGAL::Boost_iostreams_support
CGAL::Boost_serialization_support)
if(TARGET CGAL::TBB_support)
target_link_libraries(${target} PUBLIC CGAL::TBB_support)

2
Classification/examples/Classification/example_cluster_classification.cpp
View File

@ -8,7 +8,7 @@
#include <iostream>
#include <string>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Classification.h>

6
Classification/test/Classification/CMakeLists.txt
View File

@ -38,8 +38,8 @@ if(NOT TARGET CGAL::Boost_iostreams_support)
endif()
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS "This project requires the Eigen library, and will not be compiled.")
set(Classification_dependencies_met FALSE)
@ -57,7 +57,7 @@ create_single_source_cgal_program("test_classification_io.cpp")
foreach(target test_classification_point_set test_classification_io)
target_link_libraries(
${target} PUBLIC CGAL::Eigen_support CGAL::Boost_iostreams_support
${target} PUBLIC CGAL::Eigen3_support CGAL::Boost_iostreams_support
CGAL::Boost_serialization_support)
if(TARGET CGAL::TBB_support)
target_link_libraries(${target} PUBLIC CGAL::TBB_support)

2
Documentation/doc/Documentation/Third_party.txt
View File

@ -129,7 +129,7 @@ dependency over \sc{Eigen} is marked on the <a
href="https://doc.cgal.org/latest/Manual/packages.html">Package
Overview</a> page. In order to use Eigen in \cgal programs, the
executables should be linked with the CMake imported target
`CGAL::Eigen_support` provided in `CGAL_Eigen_support.cmake`.
`CGAL::Eigen3_support` provided in `CGAL_Eigen3_support.cmake`.
The \sc{Eigen} web site is <A HREF="http://eigen.tuxfamily.org/index.php?title=Main_Page">`http://eigen.tuxfamily.org`</A>.

8
Generator/examples/Generator/CMakeLists.txt
View File

@ -8,7 +8,7 @@ find_package(CGAL REQUIRED)
# Use Eigen
find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
# create a target per cppfile
file(
@ -18,11 +18,11 @@ file(
foreach(cppfile ${cppfiles})
if(NOT (${cppfile} STREQUAL "random_points_in_tetrahedral_mesh_3.cpp")
OR NOT (${cppfile} STREQUAL "random_points_on_tetrahedral_mesh_3.cpp")
OR TARGET CGAL::Eigen_support)
OR TARGET CGAL::Eigen3_support)
create_single_source_cgal_program("${cppfile}")
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
get_filename_component(target ${cppfile} NAME_WE)
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
endif()
endif()
endforeach()

8
Generator/test/Generator/CMakeLists.txt
View File

@ -8,7 +8,7 @@ find_package(CGAL REQUIRED)
# Use Eigen
find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
# create a target per cppfile
file(
@ -17,11 +17,11 @@ file(
${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
foreach(cppfile ${cppfiles})
if(NOT (${cppfile} STREQUAL "generic_random_test.cpp") OR TARGET
CGAL::Eigen_support)
CGAL::Eigen3_support)
create_single_source_cgal_program("${cppfile}")
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
get_filename_component(target ${cppfile} NAME_WE)
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
endif()
endif()
endforeach()

2
Geomview/package_info/Geomview/dependencies
View File

@ -1,6 +1,4 @@
Algebraic_foundations
Circulator
Geomview
Installation
Interval_support
Kernel_23

6
GraphicsView/demo/Polygon/CMakeLists.txt
View File

@ -16,8 +16,8 @@ endif()
find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5 Core)
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS
"NOTICE: This project requires the Eigen library, and will not be compiled."
@ -55,7 +55,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
add_to_cached_list(CGAL_EXECUTABLE_TARGETS Polygon_2)
target_link_libraries(Polygon_2 PRIVATE CGAL::CGAL CGAL::CGAL_Qt5
CGAL::Eigen_support Qt5::Gui)
CGAL::Eigen3_support Qt5::Gui)
include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
cgal_add_compilation_test(Polygon_2)

12
Heat_method_3/examples/Heat_method_3/CMakeLists.txt
View File

@ -23,9 +23,9 @@ if(NOT Boost_FOUND)
endif()
find_package(Eigen3 3.3.0)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS
"This project requires the Eigen library (3.3 or greater), and will not be compiled."
@ -42,11 +42,11 @@ include_directories(BEFORE include)
include(CGAL_CreateSingleSourceCGALProgram)
create_single_source_cgal_program("heat_method.cpp")
target_link_libraries(heat_method PUBLIC CGAL::Eigen_support)
target_link_libraries(heat_method PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("heat_method_polyhedron.cpp")
target_link_libraries(heat_method_polyhedron PUBLIC CGAL::Eigen_support)
target_link_libraries(heat_method_polyhedron PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("heat_method_surface_mesh.cpp")
target_link_libraries(heat_method_surface_mesh PUBLIC CGAL::Eigen_support)
target_link_libraries(heat_method_surface_mesh PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("heat_method_surface_mesh_direct.cpp")
target_link_libraries(heat_method_surface_mesh_direct
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)

10
Heat_method_3/test/Heat_method_3/CMakeLists.txt
View File

@ -23,9 +23,9 @@ if(NOT Boost_FOUND)
endif()
find_package(Eigen3 3.3.0)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS
"This project requires the Eigen library (3.3 or greater), and will not be compiled."
@ -42,9 +42,9 @@ include_directories(BEFORE include)
include(CGAL_CreateSingleSourceCGALProgram)
create_single_source_cgal_program("heat_method_concept.cpp")
target_link_libraries(heat_method_concept PUBLIC CGAL::Eigen_support)
target_link_libraries(heat_method_concept PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("heat_method_surface_mesh_test.cpp")
target_link_libraries(heat_method_surface_mesh_test PUBLIC CGAL::Eigen_support)
target_link_libraries(heat_method_surface_mesh_test PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("heat_method_surface_mesh_direct_test.cpp")
target_link_libraries(heat_method_surface_mesh_direct_test
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)

9
Installation/cmake/modules/CGAL_Eigen3_support.cmake Normal file
View File

@ -0,0 +1,9 @@
if(EIGEN3_FOUND AND NOT TARGET CGAL::Eigen3_support)
if(NOT TARGET Threads::Threads)
find_package(Threads REQUIRED)
endif()
add_library(CGAL::Eigen3_support INTERFACE IMPORTED)
set_target_properties(CGAL::Eigen3_support PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "CGAL_EIGEN3_ENABLED"
INTERFACE_INCLUDE_DIRECTORIES "${EIGEN3_INCLUDE_DIR}")
endif()

2
Installation/cmake/modules/UseEigen3.cmake
View File

@ -8,4 +8,4 @@ add_definitions(-DCGAL_EIGEN3_ENABLED)
set (EIGEN3_SETUP TRUE)
message(DEPRECATION "This file UseEigen.cmake is deprecated, and the imported target `CGAL::Eigen_support` from CGAL_Eigen_support.cmake should be used instead.")
message(DEPRECATION "This file UseEigen.cmake is deprecated, and the imported target `CGAL::Eigen3_support` from CGAL_Eigen3_support.cmake should be used instead.")

11
Installation/cmake/modules/list_of_whitelisted_headers.cmake
View File

@ -31,6 +31,17 @@ set(list_of_whitelisted_headers_txt [=[
CGAL/Three/Viewer_config.h
CGAL/Three/Viewer_interface.h
CGAL/Three/Three.h
CGAL/boost/graph/properties_OpenMesh.h
CGAL/boost/graph/properties_TriMesh_ArrayKernelT.h
CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h
CGAL/boost/graph/graph_traits_TriMesh_ArrayKernelT.h
CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h
CGAL/boost/graph/partition.h
CGAL/boost/graph/METIS/partition_dual_graph.h
CGAL/boost/graph/METIS/partition_graph.h
CGAL/IO/Triangulation_geomview_ostream_3.h
CGAL/IO/Triangulation_geomview_ostream_2.h
CGAL/IO/Polyhedron_geomview_ostream.h
]=])

6
Installation/include/CGAL/config.h
View File

@ -466,9 +466,9 @@ using std::max;
//-------------------------------------------------------------------//
// Is Geomview usable ?
#if !defined(_MSC_VER) && !defined(__MINGW32__)
# define CGAL_USE_GEOMVIEW
#endif
//#if !defined(_MSC_VER) && !defined(__MINGW32__)
//# define CGAL_USE_GEOMVIEW
//#endif
//-------------------------------------------------------------------//

8
Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
View File

@ -8,8 +8,8 @@ find_package(CGAL REQUIRED)
# use Eigen
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
# Link with Boost.ProgramOptions (optional)
find_package(Boost QUIET COMPONENTS program_options)
if(Boost_PROGRAM_OPTIONS_FOUND)
@ -27,9 +27,9 @@ if(TARGET CGAL::Eigen_support)
endif()
create_single_source_cgal_program("Mesh_estimation.cpp")
target_link_libraries(Mesh_estimation PUBLIC CGAL::Eigen_support)
target_link_libraries(Mesh_estimation PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("Single_estimation.cpp")
target_link_libraries(Single_estimation PUBLIC CGAL::Eigen_support)
target_link_libraries(Single_estimation PUBLIC CGAL::Eigen3_support)
else()
message(

6
Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt
View File

@ -8,10 +8,10 @@ find_package(CGAL REQUIRED)
# use Eigen
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
create_single_source_cgal_program("blind_1pt.cpp")
target_link_libraries(blind_1pt PUBLIC CGAL::Eigen_support)
target_link_libraries(blind_1pt PUBLIC CGAL::Eigen3_support)
else()
message(
STATUS

56
Mesh_3/examples/Mesh_3/CMakeLists.txt
View File

@ -21,7 +21,7 @@ endif()
# Use Eigen
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
find_package(VTK QUIET COMPONENTS vtkImagingGeneral vtkIOImage NO_MODULE)
if(VTK_FOUND)
@ -41,33 +41,33 @@ else()
endif()
create_single_source_cgal_program("mesh_hybrid_mesh_domain.cpp")
target_link_libraries(mesh_hybrid_mesh_domain PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_hybrid_mesh_domain PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_implicit_sphere.cpp")
target_link_libraries(mesh_implicit_sphere PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_implicit_sphere PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_implicit_sphere_variable_size.cpp")
target_link_libraries(mesh_implicit_sphere_variable_size
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_two_implicit_spheres_with_balls.cpp")
target_link_libraries(mesh_two_implicit_spheres_with_balls
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_implicit_domains_2.cpp"
"implicit_functions.cpp")
target_link_libraries(mesh_implicit_domains_2 PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_implicit_domains_2 PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_cubes_intersection.cpp")
target_link_libraries(mesh_cubes_intersection PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_cubes_intersection PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_cubes_intersection_with_features.cpp")
target_link_libraries(mesh_cubes_intersection_with_features
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_implicit_domains.cpp"
"implicit_functions.cpp")
target_link_libraries(mesh_implicit_domains PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_implicit_domains PUBLIC CGAL::Eigen3_support)
find_package( ITT QUIET )
if(TARGET ITT::ITT)
@ -76,40 +76,40 @@ if(TARGET ITT::ITT)
endif()
create_single_source_cgal_program( "mesh_polyhedral_domain.cpp" )
target_link_libraries(mesh_polyhedral_domain PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_polyhedral_domain PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_polyhedral_domain_sm.cpp")
target_link_libraries(mesh_polyhedral_domain_sm PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_polyhedral_domain_sm PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program(
"mesh_polyhedral_domain_with_surface_inside.cpp")
target_link_libraries(mesh_polyhedral_domain_with_surface_inside
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("remesh_polyhedral_surface.cpp")
target_link_libraries(remesh_polyhedral_surface PUBLIC CGAL::Eigen_support)
target_link_libraries(remesh_polyhedral_surface PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("remesh_polyhedral_surface_sm.cpp")
target_link_libraries(remesh_polyhedral_surface_sm PUBLIC CGAL::Eigen_support)
target_link_libraries(remesh_polyhedral_surface_sm PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_polyhedral_domain_with_features.cpp")
target_link_libraries(mesh_polyhedral_domain_with_features
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_polyhedral_domain_with_features_sm.cpp")
target_link_libraries(mesh_polyhedral_domain_with_features_sm
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program(
"mesh_polyhedral_domain_with_lipschitz_sizing.cpp")
target_link_libraries(mesh_polyhedral_domain_with_lipschitz_sizing
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_polyhedral_complex.cpp")
target_link_libraries(mesh_polyhedral_complex PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_polyhedral_complex PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_polyhedral_complex_sm.cpp")
target_link_libraries(mesh_polyhedral_complex_sm PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_polyhedral_complex_sm PUBLIC CGAL::Eigen3_support)
if(TARGET CGAL::CGAL_ImageIO)
if(VTK_FOUND AND ("${VTK_VERSION_MAJOR}" GREATER "5" OR VTK_VERSION
@ -117,41 +117,41 @@ if(TARGET CGAL::CGAL_ImageIO)
add_executable(mesh_3D_gray_vtk_image mesh_3D_gray_vtk_image.cpp)
target_link_libraries(
mesh_3D_gray_vtk_image
PUBLIC CGAL::Eigen_support CGAL::CGAL CGAL::CGAL_ImageIO
PUBLIC CGAL::Eigen3_support CGAL::CGAL CGAL::CGAL_ImageIO
${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${VTK_LIBRARIES})
cgal_add_test(mesh_3D_gray_vtk_image)
add_to_cached_list(CGAL_EXECUTABLE_TARGETS mesh_3D_gray_vtk_image)
endif()
create_single_source_cgal_program("mesh_3D_gray_image.cpp")
target_link_libraries(mesh_3D_gray_image PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_3D_gray_image PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_3D_gray_image_multiple_values.cpp")
target_link_libraries(mesh_3D_gray_image_multiple_values
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_3D_image_with_features.cpp")
target_link_libraries(mesh_3D_image_with_features PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_3D_image_with_features PUBLIC CGAL::Eigen3_support)
if(CGAL_ImageIO_USE_ZLIB)
create_single_source_cgal_program("mesh_optimization_example.cpp")
target_link_libraries(mesh_optimization_example PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_optimization_example PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_optimization_lloyd_example.cpp")
target_link_libraries(mesh_optimization_lloyd_example
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_3D_image.cpp")
target_link_libraries(mesh_3D_image PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_3D_image PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program(
"mesh_3D_image_with_custom_initialization.cpp")
target_link_libraries(mesh_3D_image_with_custom_initialization
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_3D_image_variable_size.cpp")
target_link_libraries(mesh_3D_image_variable_size
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
else()
message(
STATUS

2
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
View File

@ -40,7 +40,7 @@
#include <boost/range/end.hpp>
#include <boost/optional.hpp>
#include <CGAL/boost/iterator/transform_iterator.hpp>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/type_traits/is_convertible.hpp>
#include <boost/unordered_set.hpp>

2
Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
View File

@ -50,7 +50,7 @@
#include <CGAL/boost/iterator/transform_iterator.hpp>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#ifndef CGAL_NO_ASSERTIONS
# include <boost/math/special_functions/next.hpp> // for float_prior
#endif

2
Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
View File

@ -38,7 +38,7 @@
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <boost/optional.hpp>
#include <boost/type_traits/is_convertible.hpp>

6
Mesh_3/test/Mesh_3/CMakeLists.txt
View File

@ -22,8 +22,8 @@ if ( CGAL_FOUND )
# Use Eigen
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
include(CGAL_Eigen_support)
if (NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if (NOT TARGET CGAL::Eigen3_support)
message(STATUS "This project requires the Eigen library, and will not be compiled.")
return()
endif()
@ -97,7 +97,7 @@ if ( CGAL_FOUND )
test_mesh_cell_base_3
test_meshing_with_one_step.cpp)
if(TARGET ${target})
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
endif()
endforeach()

7
Minkowski_sum_2/examples/Minkowski_sum_2/approx_inset.cpp
View File

@ -4,7 +4,7 @@
#include <fstream>
#include <iostream>
#include <list>
#include <boost/timer.hpp>
#include <CGAL/Timer.h>
#include <CGAL/approximated_offset_2.h>
@ -33,9 +33,10 @@ int main(int argc, char* argv[])
// Approximate the offset polygon.
std::list<Polygon_2> inset_polygons;
boost::timer timer;
CGAL::Timer timer;
timer.start();
approximated_inset_2(P, 1, 0.00001, std::back_inserter(inset_polygons));
double secs = timer.elapsed();
double secs = timer.time();
std::list<Polygon_2>::iterator it;
std::cout << "The inset comprises " << inset_polygons.size()

7
Minkowski_sum_2/examples/Minkowski_sum_2/approx_offset.cpp
View File

@ -2,7 +2,7 @@
// Computing the approximated offset of a polygon.
#include <fstream>
#include <boost/timer.hpp>
#include <CGAL/Timer.h>
#include <CGAL/approximated_offset_2.h>
@ -26,9 +26,10 @@ int main(int argc, char* argv[])
<< std::endl;
// Approximate the offset polygon with radius 5 and error bound 0.00001.
boost::timer timer;
CGAL::Timer timer;
timer.start();
Polygon_with_holes_2 offset = CGAL::approximated_offset_2(P, 5, 0.00001);
double secs = timer.elapsed();
double secs = timer.time();
std::cout << "The offset polygon has " << offset.outer_boundary().size()
<< " vertices, " << offset.number_of_holes() << " holes."

7
Minkowski_sum_2/examples/Minkowski_sum_2/exact_inset.cpp
View File

@ -14,7 +14,7 @@ int main()
#else
#include <fstream>
#include <boost/timer.hpp>
#include <CGAL/Timer.h>
#include <CGAL/Gps_traits_2.h>
#include <CGAL/offset_polygon_2.h>
@ -43,9 +43,10 @@ int main(int argc, char* argv[])
// Compute the inner offset of the polygon.
Traits traits;
std::list<Offset_polygon> inset_polygons;
boost::timer timer;
CGAL::Timer timer;
timer.start();
inset_polygon_2(P, 1, traits, std::back_inserter(inset_polygons));
double secs = timer.elapsed();
double secs = timer.time();
std::list<Offset_polygon>::iterator it;
std::cout << "The inset comprises "

7
Minkowski_sum_2/examples/Minkowski_sum_2/exact_offset.cpp
View File

@ -14,7 +14,7 @@ int main()
#else
#include <fstream>
#include <boost/timer.hpp>
#include <CGAL/Timer.h>
#include <CGAL/Gps_traits_2.h>
#include <CGAL/offset_polygon_2.h>
@ -42,9 +42,10 @@ int main(int argc, char* argv[])
// Compute the offset polygon.
Traits traits;
boost::timer timer;
CGAL::Timer timer;
timer.start();
Offset_polygon_with_holes_2 offset = CGAL::offset_polygon_2(P, 5, traits);
double secs = timer.elapsed();
double secs = timer.time();
std::cout << "The offset polygon has " << offset.outer_boundary().size()
<< " vertices, " << offset.number_of_holes() << " holes."

9
Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum_with_holes.cpp
View File

@ -8,7 +8,7 @@
#include <string.h>
#include <list>
#include <boost/timer.hpp>
#include <CGAL/Timer.h>
typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel;
typedef CGAL::Polygon_2<Kernel> Polygon_2;
@ -146,7 +146,8 @@ int main(int argc, char* argv[])
}
Polygon_with_holes_2 p, q;
boost::timer timer;
CGAL::Timer timer;
timer.start();
std::list<Strategy> strategies;
@ -186,9 +187,9 @@ int main(int argc, char* argv[])
std::list<Strategy>::iterator it;
for (it = strategies.begin(); it != strategies.end(); ++it) {
std::cout << "Using " << strategy_names[*it] << ": ";
timer.restart();
timer.reset();
Polygon_with_holes_2 result = compute_minkowski_sum_2(p, q, *it);
double secs = timer.elapsed();
double secs = timer.time();
std::cout << secs << " s " << std::flush;
if (compare) {

2
NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h
View File

@ -19,7 +19,7 @@
#include <CGAL/NewKernel_d/Filtered_predicate2.h>
#include <CGAL/iterator_from_indices.h>
#include <CGAL/NewKernel_d/Define_kernel_types.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
namespace CGAL {

6
NewKernel_d/test/NewKernel_d/CMakeLists.txt
View File

@ -16,10 +16,10 @@ endif()
find_package(CGAL REQUIRED)
find_package(Eigen3)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
create_single_source_cgal_program("Epick_d.cpp")
target_link_libraries(Epick_d PUBLIC CGAL::Eigen_support)
target_link_libraries(Epick_d PUBLIC CGAL::Eigen3_support)
else()
message(

6
Number_types/test/Number_types/CMakeLists.txt
View File

@ -80,7 +80,7 @@ create_single_source_cgal_program("test_nt_Coercion_traits.cpp")
create_single_source_cgal_program("eigen.cpp")
find_package(Eigen3 3.2.0) #(requires 3.2.0 or greater)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
target_link_libraries(eigen PUBLIC CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
target_link_libraries(eigen PUBLIC CGAL::Eigen3_support)
endif()

6
Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt
View File

@ -11,12 +11,12 @@ find_package(CGAL REQUIRED)
include(${CGAL_USE_FILE})
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS "This project requires the Eigen library, and will not be compiled.")
return()
endif()
create_single_source_cgal_program("bench_obb.cpp")
target_link_libraries(bench_obb PUBLIC CGAL::Eigen_support)
target_link_libraries(bench_obb PUBLIC CGAL::Eigen3_support)

6
Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt
View File

@ -9,8 +9,8 @@ find_package(CGAL REQUIRED)
include(${CGAL_USE_FILE})
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS "This project requires the Eigen library, and will not be compiled.")
return()
@ -22,5 +22,5 @@ create_single_source_cgal_program("rotated_aabb_tree_example.cpp")
foreach(target obb_example obb_with_point_maps_example
rotated_aabb_tree_example)
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
endforeach()

6
Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt
View File

@ -9,8 +9,8 @@ find_package(CGAL REQUIRED)
include(${CGAL_USE_FILE})
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS "This project requires the Eigen library, and will not be compiled.")
return()
@ -21,5 +21,5 @@ create_single_source_cgal_program("test_nelder_mead.cpp")
create_single_source_cgal_program("test_optimization_algorithms.cpp")
foreach(target test_OBB_traits test_nelder_mead test_optimization_algorithms)
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
endforeach()

6
Periodic_3_mesh_3/examples/Periodic_3_mesh_3/CMakeLists.txt
View File

@ -17,8 +17,8 @@ include(${CGAL_USE_FILE})
# Use Eigen
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS "This project requires the Eigen library, and will not be compiled.")
return()
@ -47,5 +47,5 @@ foreach(
mesh_implicit_shape mesh_implicit_multi_domain
mesh_implicit_shape_with_subdomains mesh_implicit_shape_with_optimizers
mesh_implicit_shape_with_features)
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
endforeach()

2
Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h
View File

@ -49,7 +49,7 @@
#include <CGAL/boost/iterator/transform_iterator.hpp>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#ifndef CGAL_NO_ASSERTIONS
# include <boost/math/special_functions/next.hpp> // for float_prior
#endif

10
Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt
View File

@ -14,18 +14,18 @@ include(${CGAL_USE_FILE})
# Use Eigen
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS "This project requires the Eigen library, and will not be compiled.")
return()
endif()
create_single_source_cgal_program("test_implicit_shapes_bunch.cpp")
target_link_libraries(test_implicit_shapes_bunch PUBLIC CGAL::Eigen_support)
target_link_libraries(test_implicit_shapes_bunch PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("test_implicit_shapes_with_features.cpp")
target_link_libraries(test_implicit_shapes_with_features
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("test_triply_periodic_minimal_surfaces.cpp")
target_link_libraries(test_triply_periodic_minimal_surfaces
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)

4
Point_set_3/examples/Point_set_3/CMakeLists.txt
View File

@ -36,10 +36,10 @@ create_single_source_cgal_program("point_set_read_ply.cpp" CXX_FEATURES
${needed_cxx_features})
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
if(EIGEN3_FOUND)
create_single_source_cgal_program("point_set_algo.cpp")
target_link_libraries(point_set_algo PUBLIC CGAL::Eigen_support)
target_link_libraries(point_set_algo PUBLIC CGAL::Eigen3_support)
endif()
create_single_source_cgal_program("draw_point_set_3.cpp")

10
Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
View File

@ -80,9 +80,9 @@ endif()
# Use Eigen
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
set(CGAL_libs ${CGAL_libs} CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
set(CGAL_libs ${CGAL_libs} CGAL::Eigen3_support)
# Executables that require Eigen
foreach(
@ -99,10 +99,10 @@ if(TARGET CGAL::Eigen_support)
add_executable(${target} "${target}.cpp")
target_link_libraries(${target} ${CGAL_libs})
endforeach()
if (TARGET CGAL::Eigen_support AND TARGET CGAL::LASLIB_support)
if (TARGET CGAL::Eigen3_support AND TARGET CGAL::LASLIB_support)
add_executable( orient_scanlines_example "orient_scanlines_example.cpp" )
target_link_libraries(orient_scanlines_example ${CGAL_libs}
CGAL::Eigen_support CGAL::LASLIB_support)
CGAL::Eigen3_support CGAL::LASLIB_support)
endif()
# Executables that require libpointmatcher
find_package(libpointmatcher QUIET)

4
Point_set_processing_3/examples/Point_set_processing_3/registration_with_OpenGR.cpp
View File

@ -25,7 +25,7 @@ int main(int argc, const char** argv)
const char* fname2 = (argc>2)?argv[2]:"data/hippo2.ply";
std::vector<Pwn> pwns1, pwns2;
std::ifstream input(fname1);
std::ifstream input(fname1, std::ios::binary);
if (!input ||
!CGAL::read_ply_points(input, std::back_inserter(pwns1),
CGAL::parameters::point_map (CGAL::First_of_pair_property_map<Pwn>()).
@ -36,7 +36,7 @@ int main(int argc, const char** argv)
}
input.close();
input.open(fname2);
input.open(fname2, std::ios::binary);
if (!input ||
!CGAL::read_ply_points(input, std::back_inserter(pwns2),
CGAL::parameters::point_map (Point_map()).

4
Point_set_processing_3/examples/Point_set_processing_3/registration_with_opengr_pointmatcher_pipeline.cpp
View File

@ -28,7 +28,7 @@ int main(int argc, const char** argv)
const char* fname2 = (argc>2)?argv[2]:"data/hippo2.ply";
std::vector<Pwn> pwns1, pwns2;
std::ifstream input(fname1);
std::ifstream input(fname1, std::ios::binary);
if (!input ||
!CGAL::read_ply_points(input, std::back_inserter(pwns1),
CGAL::parameters::point_map (CGAL::First_of_pair_property_map<Pwn>()).
@ -39,7 +39,7 @@ int main(int argc, const char** argv)
}
input.close();
input.open(fname2);
input.open(fname2, std::ios::binary);
if (!input ||
!CGAL::read_ply_points(input, std::back_inserter(pwns2),
CGAL::parameters::point_map (Point_map()).

4
Point_set_processing_3/examples/Point_set_processing_3/registration_with_pointmatcher.cpp
View File

@ -28,7 +28,7 @@ int main(int argc, const char** argv)
const char* fname2 = (argc>2)?argv[2]:"data/hippo2.ply";
std::vector<Pwn> pwns1, pwns2;
std::ifstream input(fname1);
std::ifstream input(fname1, std::ios::binary);
if (!input ||
!CGAL::read_ply_points(input, std::back_inserter(pwns1),
CGAL::parameters::point_map (CGAL::First_of_pair_property_map<Pwn>()).
@ -39,7 +39,7 @@ int main(int argc, const char** argv)
}
input.close();
input.open(fname2);
input.open(fname2, std::ios::binary);
if (!input ||
!CGAL::read_ply_points(input, std::back_inserter(pwns2),
CGAL::parameters::point_map (Point_map()).

2
Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Neighbor_query.h
View File

@ -22,7 +22,7 @@
#include <CGAL/iterator.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
namespace CGAL {
namespace Point_set_processing_3 {

14
Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
View File

@ -48,27 +48,27 @@ create_single_source_cgal_program("structuring_test.cpp")
# Use Eigen
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
if(EIGEN3_FOUND)
# Executables that require Eigen
create_single_source_cgal_program("normal_estimation_test.cpp")
target_link_libraries(normal_estimation_test PUBLIC CGAL::Eigen_support)
target_link_libraries(normal_estimation_test PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("hierarchy_simplification_test.cpp")
target_link_libraries(hierarchy_simplification_test
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("smoothing_test.cpp")
target_link_libraries(smoothing_test PUBLIC CGAL::Eigen_support)
target_link_libraries(smoothing_test PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("vcm_plane_test.cpp")
target_link_libraries(vcm_plane_test PUBLIC CGAL::Eigen_support)
target_link_libraries(vcm_plane_test PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("vcm_all_test.cpp")
target_link_libraries(vcm_all_test PUBLIC CGAL::Eigen_support)
target_link_libraries(vcm_all_test PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("jet_pointer_as_property_map.cpp")
target_link_libraries(jet_pointer_as_property_map PUBLIC CGAL::Eigen_support)
target_link_libraries(jet_pointer_as_property_map PUBLIC CGAL::Eigen3_support)
else()
message(
STATUS

12
Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt
View File

@ -31,19 +31,19 @@ endif()
# Find Eigen3 (requires 3.1.0 or greater)
find_package(Eigen3 3.1.0)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
# Executables that require Eigen 3
create_single_source_cgal_program("poisson_reconstruction_example.cpp")
target_link_libraries(poisson_reconstruction_example
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("poisson_reconstruction.cpp")
target_link_libraries(poisson_reconstruction PUBLIC CGAL::Eigen_support)
target_link_libraries(poisson_reconstruction PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("poisson_reconstruction_function.cpp")
target_link_libraries(poisson_reconstruction_function
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("tutorial_example.cpp")
target_link_libraries(tutorial_example PUBLIC CGAL::Eigen_support)
target_link_libraries(tutorial_example PUBLIC CGAL::Eigen3_support)
else()
message(
STATUS

8
Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt
View File

@ -30,16 +30,16 @@ if(MSVC)
endif()
# Temporary debugging stuff
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
# Executables that require Eigen 3.1
create_single_source_cgal_program("poisson_reconstruction_test.cpp")
target_link_libraries(poisson_reconstruction_test PUBLIC CGAL::Eigen_support)
target_link_libraries(poisson_reconstruction_test PUBLIC CGAL::Eigen3_support)
find_package(TBB)
include(CGAL_TBB_support)
if (TBB_FOUND)
create_single_source_cgal_program( "poisson_and_parallel_mesh_3.cpp" )
target_link_libraries(poisson_and_parallel_mesh_3 PUBLIC CGAL::Eigen_support CGAL::TBB_support)
target_link_libraries(poisson_and_parallel_mesh_3 PUBLIC CGAL::Eigen3_support CGAL::TBB_support)
else()
message(STATUS "NOTICE: test with parallel Mesh_3 needs TBB and will not be compiled.")
endif()

8
Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt
View File

@ -23,7 +23,7 @@ endif()
# include for local package
find_package(Eigen3 3.2.0) #(requires 3.2.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
# Creating entries for all .cpp/.C files with "main" routine
# ##########################################################
@ -32,7 +32,7 @@ create_single_source_cgal_program("polygon_mesh_slicer.cpp")
create_single_source_cgal_program("hole_filling.cpp")
if(TARGET CGAL::Eigen_support)
target_link_libraries(polygon_mesh_slicer PUBLIC CGAL::Eigen_support)
target_link_libraries(hole_filling PUBLIC CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
target_link_libraries(polygon_mesh_slicer PUBLIC CGAL::Eigen3_support)
target_link_libraries(hole_filling PUBLIC CGAL::Eigen3_support)
endif()

20
Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
View File

@ -31,26 +31,26 @@ endif()
# include for local package
find_package(Eigen3 3.2.0) #(requires 3.2.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
# Creating entries for all .cpp/.C files with "main" routine
# ##########################################################
create_single_source_cgal_program("hausdorff_distance_remeshing_example.cpp")
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
create_single_source_cgal_program("hole_filling_example.cpp")
target_link_libraries(hole_filling_example PUBLIC CGAL::Eigen_support)
target_link_libraries(hole_filling_example PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("hole_filling_example_SM.cpp")
target_link_libraries(hole_filling_example_SM PUBLIC CGAL::Eigen_support)
target_link_libraries(hole_filling_example_SM PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("refine_fair_example.cpp")
target_link_libraries(refine_fair_example PUBLIC CGAL::Eigen_support)
target_link_libraries(refine_fair_example PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("shape_smoothing_example.cpp")
target_link_libraries(shape_smoothing_example PUBLIC CGAL::Eigen_support)
target_link_libraries(shape_smoothing_example PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("hole_filling_example_LCC.cpp")
target_link_libraries(hole_filling_example_LCC PUBLIC CGAL::Eigen_support)
target_link_libraries(hole_filling_example_LCC PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("mesh_smoothing_example.cpp")
target_link_libraries(mesh_smoothing_example PUBLIC CGAL::Eigen_support)
target_link_libraries(mesh_smoothing_example PUBLIC CGAL::Eigen3_support)
endif()
@ -95,9 +95,9 @@ if(OpenMesh_FOUND)
target_link_libraries(compute_normals_example_OM
PRIVATE ${OPENMESH_LIBRARIES})
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
create_single_source_cgal_program("hole_filling_example_OM.cpp")
target_link_libraries(hole_filling_example_OM PRIVATE CGAL::Eigen_support
target_link_libraries(hole_filling_example_OM PRIVATE CGAL::Eigen3_support
${OPENMESH_LIBRARIES})
endif()

2
Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_components_example.cpp
View File

@ -2,7 +2,7 @@
#include <CGAL/Surface_mesh.h>
#include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <boost/property_map/property_map.hpp>
#include <iostream>
#include <fstream>

2
Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_example.cpp
View File

@ -4,7 +4,7 @@
#include <CGAL/Polygon_mesh_processing/remesh.h>
#include <CGAL/Polygon_mesh_processing/border.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <fstream>
#include <vector>

2
Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_of_patch_example.cpp
View File

@ -4,7 +4,7 @@
#include <CGAL/Polygon_mesh_processing/remesh.h>
#include <CGAL/Polygon_mesh_processing/border.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <fstream>
#include <vector>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h
View File

@ -554,7 +554,7 @@ class Intersection_of_triangle_meshes
CGAL_assertion(&tm1!=&tm2 || f1!=f2);
typedef CGAL::Exact_predicates_exact_constructions_kernel EK;
typedef typename Node_vector::Exact_kernel EK;
typedef Coplanar_intersection<TriangleMesh, EK> Cpl_inter_pt;
std::list<Cpl_inter_pt> inter_pts;

5
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_nodes.h
View File

@ -43,6 +43,10 @@ template <class TriangleMesh,
class VertexPointMap1, class VertexPointMap2>
class Intersection_nodes<TriangleMesh, VertexPointMap1, VertexPointMap2, false, false>
{
//typedefs
public:
typedef CGAL::Exact_predicates_exact_constructions_kernel Exact_kernel;
private:
//typedefs
typedef typename boost::property_traits<VertexPointMap1>::value_type Point_3;
CGAL_static_assertion((std::is_same<typename boost::property_traits<VertexPointMap1>::value_type,
@ -50,7 +54,6 @@ class Intersection_nodes<TriangleMesh, VertexPointMap1, VertexPointMap2, false,
typedef typename Kernel_traits<Point_3>::Kernel Input_kernel;
typedef std::vector <Point_3> Nodes_vector;
typedef CGAL::Exact_predicates_exact_constructions_kernel Exact_kernel;
typedef CGAL::Cartesian_converter<Exact_kernel,Input_kernel> Exact_to_double;
typedef boost::graph_traits<TriangleMesh> GT;
typedef typename GT::halfedge_descriptor halfedge_descriptor;

8
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_of_coplanar_triangles_3.h
View File

@ -17,7 +17,6 @@
#include <CGAL/Polygon_mesh_processing/internal/Corefinement/Intersection_type.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Kernel_traits.h>
#include <CGAL/property_map.h>
@ -27,17 +26,16 @@ namespace CGAL{
namespace Polygon_mesh_processing {
namespace Corefinement{
template <class TriangleMesh, class VertexPointMap1, class VertexPointMap2>
template <class TriangleMesh, class Exact_kernel, class VertexPointMap1, class VertexPointMap2>
struct Intersect_coplanar_faces_3
{
// typedefs
typedef typename boost::property_traits<VertexPointMap1>::value_type Point;
CGAL_static_assertion((std::is_same<typename boost::property_traits<VertexPointMap1>::value_type,
typename boost::property_traits<VertexPointMap1>::value_type>::value));
typename boost::property_traits<VertexPointMap2>::value_type>::value));
typedef typename CGAL::Kernel_traits<Point>::Kernel Input_kernel;
typedef CGAL::Exact_predicates_exact_constructions_kernel Exact_kernel;
typedef boost::graph_traits<TriangleMesh> GT;
typedef typename GT::halfedge_descriptor halfedge_descriptor;
@ -304,7 +302,7 @@ void intersection_coplanar_faces(
halfedge_descriptor h1=halfedge(f1,tm1), h2=halfedge(f2,tm2);
Intersect_coplanar_faces_3<TriangleMesh, VertexPointMap1, VertexPointMap2>
Intersect_coplanar_faces_3<TriangleMesh, Exact_kernel, VertexPointMap1, VertexPointMap2>
intersect_cpln(tm1, tm2, vpm1, vpm2);
// We will add in `inter_pts` the initial triangle of h1

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h
View File

@ -28,7 +28,7 @@
#include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <CGAL/Side_of_triangle_mesh.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/mpl/if.hpp>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h
View File

@ -42,7 +42,7 @@
#include <tbb/concurrent_vector.h>
#endif
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <exception>
#include <sstream>

18
Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt
View File

@ -25,25 +25,25 @@ endif()
# include for local package
find_package(Eigen3 3.2.0) #(requires 3.2.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
find_package(TBB)
include(CGAL_TBB_support)
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
# Creating entries for all .cpp/.C files with "main" routine
# ##########################################################
create_single_source_cgal_program("fairing_test.cpp")
target_link_libraries(fairing_test PUBLIC CGAL::Eigen_support)
target_link_libraries(fairing_test PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program(
"triangulate_hole_Polyhedron_3_no_delaunay_test.cpp")
target_link_libraries(triangulate_hole_Polyhedron_3_no_delaunay_test
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("triangulate_hole_Polyhedron_3_test.cpp")
target_link_libraries(triangulate_hole_Polyhedron_3_test
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("test_shape_smoothing.cpp")
target_link_libraries(test_shape_smoothing PUBLIC CGAL::Eigen_support)
target_link_libraries(test_shape_smoothing PUBLIC CGAL::Eigen3_support)
endif()
@ -123,13 +123,13 @@ endif()
find_package(Ceres QUIET)
if(TARGET ceres AND TARGET CGAL::Eigen_support)
if(TARGET ceres AND TARGET CGAL::Eigen3_support)
target_compile_definitions( test_mesh_smoothing PRIVATE CGAL_PMP_USE_CERES_SOLVER )
target_link_libraries( test_mesh_smoothing PUBLIC CGAL::Eigen_support PRIVATE ceres )
target_link_libraries( test_mesh_smoothing PUBLIC CGAL::Eigen3_support PRIVATE ceres )
# target_compile_definitions( test_pmp_repair_self_intersections PRIVATE CGAL_PMP_USE_CERES_SOLVER )
# target_link_libraries( test_pmp_repair_self_intersections PRIVATE ceres )
endif(TARGET ceres AND TARGET CGAL::Eigen_support)
endif(TARGET ceres AND TARGET CGAL::Eigen3_support)
if(BUILD_TESTING)
set_tests_properties(

6
Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt
View File

@ -31,8 +31,8 @@ endif()
include(CGAL_CreateSingleSourceCGALProgram)
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS
"NOTICE: This project requires Eigen 3.1 (or greater) and will not be compiled."
@ -63,7 +63,7 @@ foreach(
target
polyfit_example_without_input_planes polyfit_example_user_provided_planes
polyfit_example_model_complexty_control polyfit_example_with_region_growing)
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
if(TARGET CGAL::SCIP_support)
target_link_libraries(${target} PUBLIC CGAL::SCIP_support)
else()

6
Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
View File

@ -31,8 +31,8 @@ endif()
include(CGAL_CreateSingleSourceCGALProgram)
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS
"NOTICE: This project requires Eigen 3.1 (or greater) and will not be compiled."
@ -56,7 +56,7 @@ endif()
create_single_source_cgal_program("polygonal_surface_reconstruction_test.cpp")
target_link_libraries(polygonal_surface_reconstruction_test
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
if(TARGET CGAL::SCIP_support)
target_link_libraries(polygonal_surface_reconstruction_test
PUBLIC CGAL::SCIP_support)

14
Polyhedron/demo/Polyhedron/CMakeLists.txt
View File

@ -93,7 +93,7 @@ set_package_properties(
PURPOSE
"Requiered for the Polyhedron Edit, Parameterization, Jet fitting, Classification plugin, Surface reconstruction, Normal estimation, Smoothing, Average spacing, Feature detection, Hole Filling and Fairing plugins ."
)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
find_package(METIS)
set_package_properties(
@ -330,19 +330,19 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
add_item(scene_movable_sm_item Plugins/AABB_tree/Scene_movable_sm_item.cpp)
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
add_item(scene_textured_item Scene_textured_surface_mesh_item.cpp
texture.cpp)
target_link_libraries(scene_textured_item PUBLIC CGAL::Eigen_support)
target_link_libraries(scene_textured_item PUBLIC CGAL::Eigen3_support)
qt5_wrap_ui(editionUI_FILES Plugins/Surface_mesh_deformation/Deform_mesh.ui)
add_item(scene_edit_item
Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp
${editionUI_FILES})
target_link_libraries(
scene_edit_item PUBLIC CGAL::Eigen_support scene_surface_mesh_item
scene_edit_item PUBLIC CGAL::Eigen3_support scene_surface_mesh_item
scene_k_ring_selection scene_basic_objects)
add_item(scene_mcf_item Plugins/PMP/Scene_mcf_item.cpp)
target_link_libraries(scene_mcf_item PUBLIC CGAL::Eigen_support)
target_link_libraries(scene_mcf_item PUBLIC CGAL::Eigen3_support)
endif()
add_item(scene_implicit_function_item Scene_implicit_function_item.cpp)
@ -356,9 +356,9 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
PUBLIC scene_surface_mesh_item)
add_item(scene_points_with_normal_item Scene_points_with_normal_item.cpp)
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
target_link_libraries(scene_points_with_normal_item
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
endif()
find_package(LASLIB)

4
Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
View File

@ -1,6 +1,6 @@
include(polyhedron_demo_macros)
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
set(Classification_dependencies_met TRUE)
@ -73,7 +73,7 @@ if(TARGET CGAL::Eigen_support)
scene_surface_mesh_item
scene_selection_item
scene_color_ramp
CGAL::Eigen_support
CGAL::Eigen3_support
CGAL::Boost_serialization_support
CGAL::Boost_iostreams_support)

4
Polyhedron/demo/Polyhedron/Plugins/Display/CMakeLists.txt
View File

@ -1,5 +1,5 @@
include(polyhedron_demo_macros)
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
qt5_wrap_ui( display_propertyUI_FILES Display_property.ui )
polyhedron_demo_plugin(display_property_plugin Display_property_plugin ${display_propertyUI_FILES} KEYWORDS Viewer)
target_link_libraries(display_property_plugin
@ -7,5 +7,5 @@ if(TARGET CGAL::Eigen_support)
scene_surface_mesh_item
scene_points_with_normal_item
scene_color_ramp
CGAL::Eigen_support)
CGAL::Eigen3_support)
endif()

6
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
View File

@ -96,10 +96,10 @@ target_link_libraries(
# Use Eigen
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen_support)
target_link_libraries(mesh_3_optimization_plugin PUBLIC CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
target_link_libraries(mesh_3_optimization_plugin PUBLIC CGAL::Eigen3_support)
else() #eigen
message(
STATUS

16
Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt
View File

@ -1,10 +1,10 @@
include(polyhedron_demo_macros)
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
polyhedron_demo_plugin(jet_fitting_plugin Jet_fitting_plugin)
target_link_libraries(
jet_fitting_plugin PUBLIC scene_surface_mesh_item scene_polylines_item
CGAL::Eigen_support)
CGAL::Eigen3_support)
else()
message(
@ -17,15 +17,15 @@ polyhedron_demo_plugin(extrude_plugin Extrude_plugin KEYWORDS PMP)
target_link_libraries(extrude_plugin PUBLIC scene_surface_mesh_item
scene_selection_item)
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
if("${EIGEN3_VERSION}" VERSION_GREATER "3.1.90")
qt5_wrap_ui( hole_fillingUI_FILES Hole_filling_widget.ui)
polyhedron_demo_plugin(hole_filling_plugin Hole_filling_plugin ${hole_fillingUI_FILES} KEYWORDS PMP)
target_link_libraries(hole_filling_plugin PUBLIC scene_surface_mesh_item scene_polylines_item scene_selection_item CGAL::Eigen_support)
target_link_libraries(hole_filling_plugin PUBLIC scene_surface_mesh_item scene_polylines_item scene_selection_item CGAL::Eigen3_support)
qt5_wrap_ui( fairingUI_FILES Fairing_widget.ui)
polyhedron_demo_plugin(fairing_plugin Fairing_plugin ${fairingUI_FILES} KEYWORDS PMP)
target_link_libraries(fairing_plugin PUBLIC scene_selection_item CGAL::Eigen_support)
target_link_libraries(fairing_plugin PUBLIC scene_selection_item CGAL::Eigen3_support)
qt5_wrap_ui( Mean_curvature_flow_skeleton_pluginUI_FILES Mean_curvature_flow_skeleton_plugin.ui)
polyhedron_demo_plugin(mean_curvature_flow_skeleton_plugin Mean_curvature_flow_skeleton_plugin ${Mean_curvature_flow_skeleton_pluginUI_FILES})
@ -36,11 +36,11 @@ if(TARGET CGAL::Eigen_support)
scene_polylines_item
scene_mcf_item
demo_framework
CGAL::Eigen_support)
CGAL::Eigen3_support)
# The smoothing plugin can still do some things, even if Ceres is not found
qt5_wrap_ui( smoothingUI_FILES Smoothing_plugin.ui)
polyhedron_demo_plugin(smoothing_plugin Smoothing_plugin ${smoothingUI_FILES})
target_link_libraries(smoothing_plugin PUBLIC scene_surface_mesh_item scene_selection_item CGAL::Eigen_support)
target_link_libraries(smoothing_plugin PUBLIC scene_surface_mesh_item scene_selection_item CGAL::Eigen3_support)
find_package(Ceres QUIET)
if(TARGET ceres)
target_compile_definitions( smoothing_plugin PRIVATE CGAL_PMP_USE_CERES_SOLVER )
@ -51,7 +51,7 @@ if(TARGET CGAL::Eigen_support)
Ceres PROPERTIES
DESCRIPTION "A large scale non-linear optimization library."
PURPOSE "Can be used as a solver in the smoothing plugin.")
target_link_libraries(extrude_plugin PUBLIC CGAL::Eigen_support)
target_link_libraries(extrude_plugin PUBLIC CGAL::Eigen3_support)
else()
message(
STATUS

2
Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp
View File

@ -43,7 +43,7 @@
#include "Kernel_type.h"
#include <boost/unordered_set.hpp>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <QMap>
#include <QVector>

2
Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp
View File

@ -21,7 +21,7 @@
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/property_map.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <boost/unordered_map.hpp>
#include "Color_map.h"

16
Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt
View File

@ -1,5 +1,5 @@
include(polyhedron_demo_macros)
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
find_package(SCIP QUIET)
@ -43,7 +43,7 @@ if(TARGET CGAL::Eigen_support)
target_link_libraries(
surface_reconstruction_plugin
PUBLIC scene_polygon_soup_item scene_surface_mesh_item
scene_points_with_normal_item CGAL::Eigen_support)
scene_points_with_normal_item CGAL::Eigen3_support)
if(TARGET CGAL::SCIP_support)
target_link_libraries(surface_reconstruction_plugin
@ -62,7 +62,7 @@ if(TARGET CGAL::Eigen_support)
target_link_libraries(
point_set_normal_estimation_plugin
PUBLIC scene_points_with_normal_item scene_callback_signaler
CGAL::Eigen_support)
CGAL::Eigen3_support)
qt5_wrap_ui(features_detection_pluginUI_FILES Features_detection_plugin.ui)
polyhedron_demo_plugin(
@ -70,14 +70,14 @@ if(TARGET CGAL::Eigen_support)
${features_detection_pluginUI_FILES} KEYWORDS PointSetProcessing)
target_link_libraries(
features_detection_plugin PUBLIC scene_points_with_normal_item
CGAL::Eigen_support)
CGAL::Eigen3_support)
polyhedron_demo_plugin(point_set_smoothing_plugin Point_set_smoothing_plugin
KEYWORDS PointSetProcessing)
target_link_libraries(
point_set_smoothing_plugin
PUBLIC scene_points_with_normal_item scene_callback_signaler
CGAL::Eigen_support)
CGAL::Eigen3_support)
polyhedron_demo_plugin(
point_set_average_spacing_plugin Point_set_average_spacing_plugin KEYWORDS
@ -85,7 +85,7 @@ if(TARGET CGAL::Eigen_support)
target_link_libraries(
point_set_average_spacing_plugin
PUBLIC scene_points_with_normal_item scene_callback_signaler
CGAL::Eigen_support)
CGAL::Eigen3_support)
qt5_wrap_ui(point_set_shape_detectionUI_FILES
Point_set_shape_detection_plugin.ui)
@ -96,7 +96,7 @@ if(TARGET CGAL::Eigen_support)
target_link_libraries(
point_set_shape_detection_plugin
PUBLIC scene_surface_mesh_item scene_points_with_normal_item
scene_polygon_soup_item scene_callback_signaler CGAL::Eigen_support)
scene_polygon_soup_item scene_callback_signaler CGAL::Eigen3_support)
find_package(OpenGR QUIET)
include(CGAL_OpenGR_support)
@ -110,7 +110,7 @@ if(TARGET CGAL::Eigen_support)
${register_point_setsUI_FILES} KEYWORDS PointSetProcessing)
target_link_libraries(register_point_sets_plugin
PUBLIC scene_points_with_normal_item)
target_link_libraries(register_point_sets_plugin PUBLIC CGAL::Eigen_support)
target_link_libraries(register_point_sets_plugin PUBLIC CGAL::Eigen3_support)
if(TARGET CGAL::OpenGR_support)
target_link_libraries(register_point_sets_plugin
PUBLIC CGAL::OpenGR_support)

2
Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp
View File

@ -34,7 +34,7 @@
#include <QtPlugin>
#include <QMessageBox>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include "run_with_qprogressdialog.h"

8
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt
View File

@ -4,7 +4,7 @@ if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
find_package(CGAL REQUIRED COMPONENTS Core)
include(${CGAL_USE_FILE})
@ -14,7 +14,7 @@ if(TARGET CGAL::Eigen_support)
${parameterizationUI_FILES})
target_link_libraries(
parameterization_plugin PUBLIC scene_surface_mesh_item scene_textured_item
scene_selection_item CGAL::Eigen_support)
scene_selection_item CGAL::Eigen3_support)
else()
message(
STATUS
@ -37,8 +37,8 @@ polyhedron_demo_plugin(offset_meshing_plugin Offset_meshing_plugin
${remeshingUI_FILES})
target_link_libraries(offset_meshing_plugin PUBLIC scene_surface_mesh_item
scene_polygon_soup_item)
if(TARGET CGAL::Eigen_support)
target_link_libraries(offset_meshing_plugin PUBLIC CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
target_link_libraries(offset_meshing_plugin PUBLIC CGAL::Eigen3_support)
endif()
if(TARGET CGAL::TBB_support)
target_link_libraries(offset_meshing_plugin PUBLIC CGAL::TBB_support)

2
Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h
View File

@ -27,7 +27,7 @@
#include <CGAL/Polygon_mesh_processing/compute_normal.h>
#include <CGAL/Surface_mesh_deformation.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <QGLBuffer>
#include <QGLShader>
#include <QGLShaderProgram>

2
Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp
View File

@ -29,7 +29,7 @@
#include <CGAL/Qt/manipulatedFrame.h>
#include <CGAL/Qt/qglviewer.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>

4
Polyhedron_IO/demo/Polyhedron_IO/geomview_demo.cpp
View File

@ -12,12 +12,12 @@
#include <CGAL/basic.h>
#ifdef _MSC_VER
#if defined _MSC_VER || not defined CGAL_USE_GEOMVIEW
#include <iostream>
int main() {
std::cout << "Geomview doesn't work on Windows, so no demo." << std::endl;
std::cout << "We don't support Geomview anymore, so no demo." << std::endl;
return 0;
}
#else // can have Geomeview

1
Polyhedron_IO/package_info/Polyhedron_IO/dependencies
View File

@ -2,7 +2,6 @@ Algebraic_foundations
BGL
Circulator
Distance_2
Geomview
HalfedgeDS
Hash_map
Installation

6
Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
View File

@ -18,8 +18,8 @@ include_directories(./)
find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5)
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(NOT TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(NOT TARGET CGAL::Eigen3_support)
message(
STATUS
"NOTICE: This project requires the Eigen library, and will not be compiled."
@ -54,7 +54,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
${CGAL_Qt5_MOC_FILES})
target_link_libraries(PCA_demo PRIVATE CGAL::CGAL CGAL::CGAL_Qt5
CGAL::Eigen_support Qt5::Gui)
CGAL::Eigen3_support Qt5::Gui)
add_to_cached_list(CGAL_EXECUTABLE_TARGETS PCA_demo)

6
Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt
View File

@ -8,7 +8,7 @@ find_package(CGAL REQUIRED)
# Use Eigen
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
# create a target per cppfile
file(
@ -17,8 +17,8 @@ file(
${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
foreach(cppfile ${cppfiles})
create_single_source_cgal_program("${cppfile}")
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
get_filename_component(target ${cppfile} NAME_WE)
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
endif()
endforeach()

6
Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt
View File

@ -8,7 +8,7 @@ find_package(CGAL REQUIRED)
# Use Eigen
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
# create a target per cppfile
file(
@ -17,8 +17,8 @@ file(
${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
foreach(cppfile ${cppfiles})
create_single_source_cgal_program("${cppfile}")
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
get_filename_component(target ${cppfile} NAME_WE)
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
endif()
endforeach()

6
Property_map/examples/Property_map/CMakeLists.txt
View File

@ -24,8 +24,8 @@ endif()
create_single_source_cgal_program("dynamic_properties.cpp")
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
create_single_source_cgal_program("custom_property_map.cpp")
target_link_libraries(custom_property_map PUBLIC CGAL::Eigen_support)
target_link_libraries(custom_property_map PUBLIC CGAL::Eigen3_support)
endif()

10
Ridges_3/examples/Ridges_3/CMakeLists.txt
View File

@ -6,8 +6,8 @@ find_package(CGAL REQUIRED)
# use either Eigen
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
# Link with Boost.ProgramOptions (optional)
find_package(Boost QUIET COMPONENTS program_options)
@ -26,11 +26,11 @@ if(TARGET CGAL::Eigen_support)
endif()
create_single_source_cgal_program(Compute_Ridges_Umbilics.cpp)
target_link_libraries(Compute_Ridges_Umbilics PUBLIC CGAL::Eigen_support)
target_link_libraries(Compute_Ridges_Umbilics PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program(Ridges_Umbilics_SM.cpp)
target_link_libraries(Ridges_Umbilics_SM PUBLIC CGAL::Eigen_support)
target_link_libraries(Ridges_Umbilics_SM PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program(Ridges_Umbilics_LCC.cpp)
target_link_libraries(Ridges_Umbilics_LCC PUBLIC CGAL::Eigen_support)
target_link_libraries(Ridges_Umbilics_LCC PUBLIC CGAL::Eigen3_support)
else()

6
Ridges_3/test/Ridges_3/CMakeLists.txt
View File

@ -8,10 +8,10 @@ find_package(CGAL REQUIRED)
# use either Eigen
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
create_single_source_cgal_program("ridge_test.cpp")
target_link_libraries(ridge_test PUBLIC CGAL::Eigen_support)
target_link_libraries(ridge_test PUBLIC CGAL::Eigen3_support)
else()
message(

12
Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt
View File

@ -17,16 +17,16 @@ if(ACTIVATE_CONCURRENCY)
endif()
find_package(Eigen3 3.1.0)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
create_single_source_cgal_program("scale_space.cpp")
target_link_libraries(scale_space PUBLIC CGAL::Eigen_support)
target_link_libraries(scale_space PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("scale_space_incremental.cpp")
target_link_libraries(scale_space_incremental PUBLIC CGAL::Eigen_support)
target_link_libraries(scale_space_incremental PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("scale_space_manifold.cpp")
target_link_libraries(scale_space_manifold PUBLIC CGAL::Eigen_support)
target_link_libraries(scale_space_manifold PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("scale_space_advancing_front.cpp")
target_link_libraries(scale_space_advancing_front PUBLIC CGAL::Eigen_support)
target_link_libraries(scale_space_advancing_front PUBLIC CGAL::Eigen3_support)
if(ACTIVATE_CONCURRENCY AND TARGET CGAL::TBB_support)
target_link_libraries(scale_space PUBLIC CGAL::TBB_support)
target_link_libraries(scale_space_incremental PUBLIC CGAL::TBB_support)

8
Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/Alpha_shape_mesher.h
View File

@ -265,7 +265,7 @@ public:
*/
Facet_const_iterator shell_begin( std::size_t shell ) const
{
CGAL_assertion( shell >= 0 && shell < _shells.size() );
CGAL_assertion( shell < _shells.size() );
return _shells[ shell ];
}
/// gives an iterator to the first triple in a given shell.
@ -277,7 +277,7 @@ public:
*/
Facet_iterator shell_begin( std::size_t shell )
{
CGAL_assertion( shell >= 0 && shell < _shells.size() );
CGAL_assertion( shell < _shells.size() );
return _shells[ shell ];
}
@ -288,7 +288,7 @@ public:
*/
Facet_const_iterator shell_end( std::size_t shell ) const
{
CGAL_assertion( shell >= 0 && shell < _shells.size() );
CGAL_assertion( shell < _shells.size() );
if( shell == _shells.size()-1 )
return _surface.end();
return _shells[ shell+1 ];
@ -303,7 +303,7 @@ public:
*/
Facet_iterator shell_end( std::size_t shell )
{
CGAL_assertion( shell >= 0 && shell < _shells.size() );
CGAL_assertion( shell < _shells.size() );
if( shell == _shells.size()-1 )
return _surface.end();
return _shells[ shell+1 ];

2
Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/Weighted_PCA_smoother.h
View File

@ -23,7 +23,7 @@
#include <CGAL/Random.h>
#include <CGAL/Default_diagonalize_traits.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#ifdef CGAL_LINKED_WITH_TBB
#include "tbb/blocked_range.h"

1
Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies
View File

@ -8,7 +8,6 @@ Circulator
Distance_2
Distance_3
Filtered_kernel
Geomview
HalfedgeDS
Hash_map
Homogeneous_kernel

10
Scripts/developer_scripts/detect_packages_licenses
View File

@ -5,14 +5,15 @@
# */package_info/*/license.txt
setopt extendedglob
for p in ^*build*(/); do
if [ -d $p/include ]; then
OLD_LOCALE=$(locale | grep COLLATE | cut -d= -f2)
export LC_COLLATE="en_US.UTF-8"
for p in ^*build*(/); do
if [ -d $p/include ]; then
licFile=$p/package_info/$p/license.txt
l=`licensecheck -r $p/include $p/src | awk -F': ' '{print $2}' | grep -v BSL | sed -e 's/ *GENERATED FILE//' | sort -u`
if [ "x`echo $l | wc -l`" = "x1" ]; then
echo $l > "$licFile"
elif [ -z "`echo $l | grep -Ev '^L?GPL \(v3 or later\) *$'`" ]; then
elif [ -z "`echo $l | grep -Ev '^L?GPL \(v3 or later\) *$'`" ]; then
echo 'GPL (v3 or later)' > "$licFile"
else
# echo "MULTIPLE!" > "$licFile";
@ -20,3 +21,4 @@ for p in ^*build*(/); do
fi
fi
done
export LC_COLLATE=$OLD_LOCALE

8
Shape_detection/benchmark/Shape_detection/CMakeLists.txt
View File

@ -13,14 +13,14 @@ include(CGAL_CreateSingleSourceCGALProgram)
# Use Eigen.
find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
create_single_source_cgal_program(
"benchmark_region_growing_on_point_set_2.cpp")
target_link_libraries(benchmark_region_growing_on_point_set_2
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program(
"benchmark_region_growing_on_point_set_3.cpp")
target_link_libraries(benchmark_region_growing_on_point_set_3
PUBLIC CGAL::Eigen_support)
PUBLIC CGAL::Eigen3_support)
endif()

6
Shape_detection/examples/Shape_detection/CMakeLists.txt
View File

@ -13,8 +13,8 @@ include(CGAL_CreateSingleSourceCGALProgram)
# Use Eigen.
find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater)
include(CGAL_Eigen_support)
if(TARGET CGAL::Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen3_support)
create_single_source_cgal_program("efficient_RANSAC_basic.cpp")
create_single_source_cgal_program("efficient_RANSAC_with_callback.cpp")
create_single_source_cgal_program(
@ -37,7 +37,7 @@ if(TARGET CGAL::Eigen_support)
region_growing_on_polygon_mesh
region_growing_with_custom_classes
shape_detection_basic_deprecated)
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
endforeach()
endif()

2
Shape_detection/examples/Shape_detection/region_growing_on_point_set_3.cpp
View File

@ -7,7 +7,7 @@
#include <iterator>
// Boost includes.
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
// CGAL includes.
#include <CGAL/Timer.h>

8
Shape_detection/test/Shape_detection/CMakeLists.txt
View File

@ -13,7 +13,7 @@ include(CGAL_CreateSingleSourceCGALProgram)
# Use Eigen.
find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
if(EIGEN3_FOUND)
create_single_source_cgal_program("test_region_growing_basic.cpp")
create_single_source_cgal_program("test_region_growing_on_cube.cpp")
@ -39,7 +39,7 @@ if(EIGEN3_FOUND)
test_region_growing_on_point_set_3_with_sorting
test_region_growing_on_polygon_mesh_with_sorting
test_region_growing_on_degenerated_mesh)
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
endforeach()
set(RANSAC_PROTO_DIR CACHE PATH "")
@ -51,10 +51,10 @@ if(EIGEN3_FOUND)
file(GLOB proto_misc_src "${RANSAC_PROTO_DIR}/MiscLib/*.cpp")
add_library(libproto STATIC ${proto_src} ${proto_misc_src})
add_executable(test_validity_sampled_data "test_validity_sampled_data.cpp")
target_link_libraries(test_validity_sampled_data libproto CGAL::CGAL CGAL::Eigen_support)
target_link_libraries(test_validity_sampled_data libproto CGAL::CGAL CGAL::Eigen3_support)
else()
add_executable(test_validity_sampled_data "test_validity_sampled_data.cpp")
target_link_libraries(test_validity_sampled_data CGAL::CGAL CGAL::Eigen_support)
target_link_libraries(test_validity_sampled_data CGAL::CGAL CGAL::Eigen3_support)
endif()
cgal_add_test(test_validity_sampled_data)
endif()

2
Shape_detection/test/Shape_detection/test_validity_sampled_data.cpp
View File

@ -18,7 +18,7 @@
#include <CGAL/Real_timer.h>
#include <boost/function_output_iterator.hpp>
#include <boost/iterator/function_output_iterator.hpp>
namespace SD = CGAL::Shape_detection;

10
Solver_interface/examples/Solver_interface/CMakeLists.txt
View File

@ -8,15 +8,15 @@ find_package(CGAL REQUIRED)
# Use Eigen
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
if(TARGET CGAL::Eigen_support)
if(TARGET CGAL::Eigen3_support)
create_single_source_cgal_program("singular_value_decomposition.cpp")
target_link_libraries(singular_value_decomposition PUBLIC CGAL::Eigen_support)
target_link_libraries(singular_value_decomposition PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("sparse_solvers.cpp")
target_link_libraries(sparse_solvers PUBLIC CGAL::Eigen_support)
target_link_libraries(sparse_solvers PUBLIC CGAL::Eigen3_support)
create_single_source_cgal_program("diagonalize_matrix.cpp")
target_link_libraries(diagonalize_matrix PUBLIC CGAL::Eigen_support)
target_link_libraries(diagonalize_matrix PUBLIC CGAL::Eigen3_support)
endif()
create_single_source_cgal_program("mixed_integer_program.cpp")

4
Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt
View File

@ -9,7 +9,7 @@ find_package(CGAL REQUIRED COMPONENTS Core)
include(${CGAL_USE_FILE})
find_package(Eigen3 3.1.91) #(requires 3.2.0 or greater)
include(CGAL_Eigen_support)
include(CGAL_Eigen3_support)
include_directories(BEFORE "include")
@ -44,5 +44,5 @@ foreach(
nn3nanoflan
sizeof
deque)
target_link_libraries(${target} PUBLIC CGAL::Eigen_support)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
endforeach()

Some files were not shown because too many files have changed in this diff Show More