diff --git a/.github/install.sh b/.github/install.sh index f4e3c5f6410..047c539ff95 100755 --- a/.github/install.sh +++ b/.github/install.sh @@ -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 diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml new file mode 100644 index 00000000000..a28adb0c684 --- /dev/null +++ b/.github/workflows/checks.yml @@ -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 + diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index 6d1ff88629f..7d3a31bfd49 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -1,6 +1,6 @@ name: Test Polyhedron Demo -on: [pull_request] +on: [push, pull_request] jobs: batch_1: diff --git a/Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies b/Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies index d6667a72a3d..6a453cfa1e9 100644 --- a/Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies +++ b/Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies @@ -4,7 +4,6 @@ Arithmetic_kernel Cartesian_kernel Circulator Filtered_kernel -Geomview Hash_map Homogeneous_kernel Installation diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_polycurve_intersection.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_polycurve_intersection.cpp index 5cfd7a64f2e..7e3bfe81659 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_polycurve_intersection.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_polycurve_intersection.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/BGL/include/CGAL/boost/graph/copy_face_graph.h b/BGL/include/CGAL/boost/graph/copy_face_graph.h index ba4187b85b1..c396484f4ed 100644 --- a/BGL/include/CGAL/boost/graph/copy_face_graph.h +++ b/BGL/include/CGAL/boost/graph/copy_face_graph.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include namespace CGAL { diff --git a/BGL/package_info/BGL/dependencies b/BGL/package_info/BGL/dependencies index ebc36eadd85..7cf027b2c48 100644 --- a/BGL/package_info/BGL/dependencies +++ b/BGL/package_info/BGL/dependencies @@ -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 diff --git a/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt b/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt index 08e699ac285..dd3c87b6a36 100644 --- a/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt +++ b/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt @@ -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() diff --git a/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt b/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt index 54875af2ee2..413611d2c6a 100644 --- a/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt +++ b/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt @@ -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() diff --git a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt index 6bfda2f562d..ddcd9765d56 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt +++ b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt @@ -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) diff --git a/CGAL_ipelets/include/CGAL/grabbers.h b/CGAL_ipelets/include/CGAL/grabbers.h index 2850186ea7e..dc5a8b0e5d6 100644 --- a/CGAL_ipelets/include/CGAL/grabbers.h +++ b/CGAL_ipelets/include/CGAL/grabbers.h @@ -14,7 +14,7 @@ #ifndef CGAL_GRABBER_H #define CGAL_GRABBER_H -#include +#include namespace CGAL{ diff --git a/Classification/examples/Classification/CMakeLists.txt b/Classification/examples/Classification/CMakeLists.txt index f149d1557ac..3d2e6ebfc28 100644 --- a/Classification/examples/Classification/CMakeLists.txt +++ b/Classification/examples/Classification/CMakeLists.txt @@ -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) diff --git a/Classification/examples/Classification/example_cluster_classification.cpp b/Classification/examples/Classification/example_cluster_classification.cpp index 1573a0fc1ad..a8b8bdbe714 100644 --- a/Classification/examples/Classification/example_cluster_classification.cpp +++ b/Classification/examples/Classification/example_cluster_classification.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/Classification/test/Classification/CMakeLists.txt b/Classification/test/Classification/CMakeLists.txt index 629f3a46c29..dc1c43862b7 100644 --- a/Classification/test/Classification/CMakeLists.txt +++ b/Classification/test/Classification/CMakeLists.txt @@ -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) diff --git a/Documentation/doc/Documentation/Third_party.txt b/Documentation/doc/Documentation/Third_party.txt index 6019c3057ae..55705a34ad8 100644 --- a/Documentation/doc/Documentation/Third_party.txt +++ b/Documentation/doc/Documentation/Third_party.txt @@ -129,7 +129,7 @@ dependency over \sc{Eigen} is marked on the Package Overview 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 `http://eigen.tuxfamily.org`. diff --git a/Generator/examples/Generator/CMakeLists.txt b/Generator/examples/Generator/CMakeLists.txt index 72149414f76..28eb3bff5e9 100644 --- a/Generator/examples/Generator/CMakeLists.txt +++ b/Generator/examples/Generator/CMakeLists.txt @@ -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() diff --git a/Generator/test/Generator/CMakeLists.txt b/Generator/test/Generator/CMakeLists.txt index ff0701e7ad7..2f81e017a5e 100644 --- a/Generator/test/Generator/CMakeLists.txt +++ b/Generator/test/Generator/CMakeLists.txt @@ -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() diff --git a/Geomview/package_info/Geomview/dependencies b/Geomview/package_info/Geomview/dependencies index 7c8f7ab1d75..1598b3438f7 100644 --- a/Geomview/package_info/Geomview/dependencies +++ b/Geomview/package_info/Geomview/dependencies @@ -1,6 +1,4 @@ Algebraic_foundations -Circulator -Geomview Installation Interval_support Kernel_23 diff --git a/GraphicsView/demo/Polygon/CMakeLists.txt b/GraphicsView/demo/Polygon/CMakeLists.txt index 5d46ce8c130..4ea9ebf497c 100644 --- a/GraphicsView/demo/Polygon/CMakeLists.txt +++ b/GraphicsView/demo/Polygon/CMakeLists.txt @@ -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) diff --git a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt index 66027c7ff32..c7811372e61 100644 --- a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt +++ b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt @@ -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) diff --git a/Heat_method_3/test/Heat_method_3/CMakeLists.txt b/Heat_method_3/test/Heat_method_3/CMakeLists.txt index 962f84378b1..6641b2542ba 100644 --- a/Heat_method_3/test/Heat_method_3/CMakeLists.txt +++ b/Heat_method_3/test/Heat_method_3/CMakeLists.txt @@ -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) diff --git a/Installation/cmake/modules/CGAL_Eigen3_support.cmake b/Installation/cmake/modules/CGAL_Eigen3_support.cmake new file mode 100644 index 00000000000..cc0df0fad10 --- /dev/null +++ b/Installation/cmake/modules/CGAL_Eigen3_support.cmake @@ -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() diff --git a/Installation/cmake/modules/UseEigen3.cmake b/Installation/cmake/modules/UseEigen3.cmake index ccdb6682bd7..de98158bad4 100644 --- a/Installation/cmake/modules/UseEigen3.cmake +++ b/Installation/cmake/modules/UseEigen3.cmake @@ -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.") diff --git a/Installation/cmake/modules/list_of_whitelisted_headers.cmake b/Installation/cmake/modules/list_of_whitelisted_headers.cmake index bb6ffd5f932..cf653a08abf 100644 --- a/Installation/cmake/modules/list_of_whitelisted_headers.cmake +++ b/Installation/cmake/modules/list_of_whitelisted_headers.cmake @@ -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 ]=]) diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h index 6a00defb2e8..37bf383f136 100644 --- a/Installation/include/CGAL/config.h +++ b/Installation/include/CGAL/config.h @@ -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 //-------------------------------------------------------------------// diff --git a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt index 6b6a120bea7..fce1694719b 100644 --- a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt +++ b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt @@ -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( diff --git a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt index 72054804f9c..3adab3d539e 100644 --- a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt +++ b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt @@ -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 diff --git a/Mesh_3/examples/Mesh_3/CMakeLists.txt b/Mesh_3/examples/Mesh_3/CMakeLists.txt index 9683e4ed57a..597b72856e2 100644 --- a/Mesh_3/examples/Mesh_3/CMakeLists.txt +++ b/Mesh_3/examples/Mesh_3/CMakeLists.txt @@ -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 diff --git a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h index ae33317599b..60c7a84589d 100644 --- a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h +++ b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h index d9ddc61e0bf..ab9a4844e5f 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h +++ b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h @@ -50,7 +50,7 @@ #include -#include +#include #ifndef CGAL_NO_ASSERTIONS # include // for float_prior #endif diff --git a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h index ecc9607774f..29c4817021f 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h +++ b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include diff --git a/Mesh_3/test/Mesh_3/CMakeLists.txt b/Mesh_3/test/Mesh_3/CMakeLists.txt index 6dd24aad08b..588d5b7650c 100644 --- a/Mesh_3/test/Mesh_3/CMakeLists.txt +++ b/Mesh_3/test/Mesh_3/CMakeLists.txt @@ -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() diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/approx_inset.cpp b/Minkowski_sum_2/examples/Minkowski_sum_2/approx_inset.cpp index 6d6fd9c7110..1a4b76e2f95 100644 --- a/Minkowski_sum_2/examples/Minkowski_sum_2/approx_inset.cpp +++ b/Minkowski_sum_2/examples/Minkowski_sum_2/approx_inset.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include @@ -33,9 +33,10 @@ int main(int argc, char* argv[]) // Approximate the offset polygon. std::list 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::iterator it; std::cout << "The inset comprises " << inset_polygons.size() diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/approx_offset.cpp b/Minkowski_sum_2/examples/Minkowski_sum_2/approx_offset.cpp index e7a7169ae0a..5da48b1c819 100644 --- a/Minkowski_sum_2/examples/Minkowski_sum_2/approx_offset.cpp +++ b/Minkowski_sum_2/examples/Minkowski_sum_2/approx_offset.cpp @@ -2,7 +2,7 @@ // Computing the approximated offset of a polygon. #include -#include +#include #include @@ -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." diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/exact_inset.cpp b/Minkowski_sum_2/examples/Minkowski_sum_2/exact_inset.cpp index 4834e4f0d5e..5e83a313a07 100644 --- a/Minkowski_sum_2/examples/Minkowski_sum_2/exact_inset.cpp +++ b/Minkowski_sum_2/examples/Minkowski_sum_2/exact_inset.cpp @@ -14,7 +14,7 @@ int main() #else #include -#include +#include #include #include @@ -43,9 +43,10 @@ int main(int argc, char* argv[]) // Compute the inner offset of the polygon. Traits traits; std::list 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::iterator it; std::cout << "The inset comprises " diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/exact_offset.cpp b/Minkowski_sum_2/examples/Minkowski_sum_2/exact_offset.cpp index 5bc45a69f9c..46f9155e6c2 100644 --- a/Minkowski_sum_2/examples/Minkowski_sum_2/exact_offset.cpp +++ b/Minkowski_sum_2/examples/Minkowski_sum_2/exact_offset.cpp @@ -14,7 +14,7 @@ int main() #else #include -#include +#include #include #include @@ -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." diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum_with_holes.cpp b/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum_with_holes.cpp index 6a3fe2917b1..2e30822894f 100644 --- a/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum_with_holes.cpp +++ b/Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum_with_holes.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include typedef CGAL::Exact_predicates_exact_constructions_kernel Kernel; typedef CGAL::Polygon_2 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 strategies; @@ -186,9 +187,9 @@ int main(int argc, char* argv[]) std::list::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) { diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h b/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h index 56ecd5df953..c7f3b3ebbdd 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include namespace CGAL { diff --git a/NewKernel_d/test/NewKernel_d/CMakeLists.txt b/NewKernel_d/test/NewKernel_d/CMakeLists.txt index fc1b4ecd97e..c039a4e45b0 100644 --- a/NewKernel_d/test/NewKernel_d/CMakeLists.txt +++ b/NewKernel_d/test/NewKernel_d/CMakeLists.txt @@ -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( diff --git a/Number_types/test/Number_types/CMakeLists.txt b/Number_types/test/Number_types/CMakeLists.txt index e6bd7db16aa..fdc0448365e 100644 --- a/Number_types/test/Number_types/CMakeLists.txt +++ b/Number_types/test/Number_types/CMakeLists.txt @@ -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() diff --git a/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt index 4049c0d61f8..bc54c44a641 100644 --- a/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt +++ b/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt @@ -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) diff --git a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt index 9fdfcadbd14..5cf3ccd5bc7 100644 --- a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt +++ b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt @@ -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() diff --git a/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt index 28101edbef2..d8b1257e2ee 100644 --- a/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt +++ b/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt @@ -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() diff --git a/Periodic_3_mesh_3/examples/Periodic_3_mesh_3/CMakeLists.txt b/Periodic_3_mesh_3/examples/Periodic_3_mesh_3/CMakeLists.txt index 373da679ef9..176dd1bb67f 100644 --- a/Periodic_3_mesh_3/examples/Periodic_3_mesh_3/CMakeLists.txt +++ b/Periodic_3_mesh_3/examples/Periodic_3_mesh_3/CMakeLists.txt @@ -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() diff --git a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h index 7a6078a3d1a..8b0f3b1fb6c 100644 --- a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h +++ b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h @@ -49,7 +49,7 @@ #include -#include +#include #ifndef CGAL_NO_ASSERTIONS # include // for float_prior #endif diff --git a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt index 8dfc601878a..aeb5f547de9 100644 --- a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt +++ b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt @@ -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) diff --git a/Point_set_3/examples/Point_set_3/CMakeLists.txt b/Point_set_3/examples/Point_set_3/CMakeLists.txt index e09a0d2188f..3f256c5047f 100644 --- a/Point_set_3/examples/Point_set_3/CMakeLists.txt +++ b/Point_set_3/examples/Point_set_3/CMakeLists.txt @@ -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") diff --git a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt index 381bb2e45cf..8ab712c19b0 100644 --- a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt +++ b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt @@ -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) diff --git a/Point_set_processing_3/examples/Point_set_processing_3/registration_with_OpenGR.cpp b/Point_set_processing_3/examples/Point_set_processing_3/registration_with_OpenGR.cpp index ae11db41dbf..ff1aa3752d2 100644 --- a/Point_set_processing_3/examples/Point_set_processing_3/registration_with_OpenGR.cpp +++ b/Point_set_processing_3/examples/Point_set_processing_3/registration_with_OpenGR.cpp @@ -25,7 +25,7 @@ int main(int argc, const char** argv) const char* fname2 = (argc>2)?argv[2]:"data/hippo2.ply"; std::vector 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()). @@ -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()). diff --git a/Point_set_processing_3/examples/Point_set_processing_3/registration_with_opengr_pointmatcher_pipeline.cpp b/Point_set_processing_3/examples/Point_set_processing_3/registration_with_opengr_pointmatcher_pipeline.cpp index 2af66826d73..a5ab2cc5c36 100644 --- a/Point_set_processing_3/examples/Point_set_processing_3/registration_with_opengr_pointmatcher_pipeline.cpp +++ b/Point_set_processing_3/examples/Point_set_processing_3/registration_with_opengr_pointmatcher_pipeline.cpp @@ -28,7 +28,7 @@ int main(int argc, const char** argv) const char* fname2 = (argc>2)?argv[2]:"data/hippo2.ply"; std::vector 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()). @@ -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()). diff --git a/Point_set_processing_3/examples/Point_set_processing_3/registration_with_pointmatcher.cpp b/Point_set_processing_3/examples/Point_set_processing_3/registration_with_pointmatcher.cpp index f4de0556667..ea903b9b412 100644 --- a/Point_set_processing_3/examples/Point_set_processing_3/registration_with_pointmatcher.cpp +++ b/Point_set_processing_3/examples/Point_set_processing_3/registration_with_pointmatcher.cpp @@ -28,7 +28,7 @@ int main(int argc, const char** argv) const char* fname2 = (argc>2)?argv[2]:"data/hippo2.ply"; std::vector 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()). @@ -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()). diff --git a/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Neighbor_query.h b/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Neighbor_query.h index a879a99f4e9..1c67680a662 100644 --- a/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Neighbor_query.h +++ b/Point_set_processing_3/include/CGAL/Point_set_processing_3/internal/Neighbor_query.h @@ -22,7 +22,7 @@ #include -#include +#include namespace CGAL { namespace Point_set_processing_3 { diff --git a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt index 18b64066b9e..fd28059c11f 100644 --- a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt +++ b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt @@ -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 diff --git a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt index a2170d5334a..3dc8fba7c0c 100644 --- a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt +++ b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt @@ -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 diff --git a/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt b/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt index d65ecb7d1f0..6391989b028 100644 --- a/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt +++ b/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt @@ -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() diff --git a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt index f202163929b..ea4a0f321bd 100644 --- a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt @@ -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() diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt index 7f22f3a9f23..81294d51e01 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt @@ -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() diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_components_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_components_example.cpp index 8469158c573..924d5109ef3 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_components_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_components_example.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_example.cpp index 4058aa68a60..c514e0d89c5 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_example.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_of_patch_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_of_patch_example.cpp index db803c04d9c..ed8a0ed7759 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_of_patch_example.cpp +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/isotropic_remeshing_of_patch_example.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h index ab840fe75ec..8fba16f9380 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h @@ -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 Cpl_inter_pt; std::list inter_pts; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_nodes.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_nodes.h index 99ff0a7815f..c9293ef8a4b 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_nodes.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_nodes.h @@ -43,6 +43,10 @@ template class Intersection_nodes { +//typedefs +public: + typedef CGAL::Exact_predicates_exact_constructions_kernel Exact_kernel; +private: //typedefs typedef typename boost::property_traits::value_type Point_3; CGAL_static_assertion((std::is_same::value_type, @@ -50,7 +54,6 @@ class Intersection_nodes::Kernel Input_kernel; typedef std::vector Nodes_vector; - typedef CGAL::Exact_predicates_exact_constructions_kernel Exact_kernel; typedef CGAL::Cartesian_converter Exact_to_double; typedef boost::graph_traits GT; typedef typename GT::halfedge_descriptor halfedge_descriptor; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_of_coplanar_triangles_3.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_of_coplanar_triangles_3.h index 3c4efee0abb..3d4a6777fcc 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_of_coplanar_triangles_3.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_of_coplanar_triangles_3.h @@ -17,7 +17,6 @@ #include -#include #include #include @@ -27,17 +26,16 @@ namespace CGAL{ namespace Polygon_mesh_processing { namespace Corefinement{ -template +template struct Intersect_coplanar_faces_3 { // typedefs typedef typename boost::property_traits::value_type Point; CGAL_static_assertion((std::is_same::value_type, - typename boost::property_traits::value_type>::value)); + typename boost::property_traits::value_type>::value)); typedef typename CGAL::Kernel_traits::Kernel Input_kernel; - typedef CGAL::Exact_predicates_exact_constructions_kernel Exact_kernel; typedef boost::graph_traits 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 + Intersect_coplanar_faces_3 intersect_cpln(tm1, tm2, vpm1, vpm2); // We will add in `inter_pts` the initial triangle of h1 diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h index 60877681330..9c9557f2904 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h index 17dfd0e0051..24426ac86d9 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h @@ -42,7 +42,7 @@ #include #endif -#include +#include #include #include diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt index e1f51ba646c..365bcd19347 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt @@ -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( diff --git a/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt b/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt index 4a09e98674b..5fab527d439 100644 --- a/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt +++ b/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt @@ -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() diff --git a/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt b/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt index a45c4ded258..ada1d07084c 100644 --- a/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt +++ b/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt @@ -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) diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt index d57be49c9e1..19d7cc93284 100644 --- a/Polyhedron/demo/Polyhedron/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt @@ -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) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt index ed1d4c80cdc..9477b7bc01d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt @@ -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) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Display/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Display/CMakeLists.txt index b3263913909..6e1c9990917 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Display/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/Display/CMakeLists.txt @@ -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() diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt index 438f591f419..4c54343a0f3 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt @@ -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 diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt index ffc3c610b28..0d3dea93625 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt @@ -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 diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp index ec1181416fb..f4957d69d63 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp @@ -43,7 +43,7 @@ #include "Kernel_type.h" #include -#include +#include #include #include #include diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp index 794cc757228..2c9683fbe7d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include "Color_map.h" diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt index 39d5e3f1124..0c562c8a6f2 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt @@ -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) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp index f75d9e95aeb..064ee708375 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include "run_with_qprogressdialog.h" diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt index 1b5367ac64c..fd350a0a3d3 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt @@ -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) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h index 0352156457e..a5db1cb3f62 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp index ed1fd56a3ec..1cbc053e81c 100644 --- a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/Polyhedron_IO/demo/Polyhedron_IO/geomview_demo.cpp b/Polyhedron_IO/demo/Polyhedron_IO/geomview_demo.cpp index cb83e2415d8..f8e2428d1c1 100644 --- a/Polyhedron_IO/demo/Polyhedron_IO/geomview_demo.cpp +++ b/Polyhedron_IO/demo/Polyhedron_IO/geomview_demo.cpp @@ -12,12 +12,12 @@ #include -#ifdef _MSC_VER +#if defined _MSC_VER || not defined CGAL_USE_GEOMVIEW #include 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 diff --git a/Polyhedron_IO/package_info/Polyhedron_IO/dependencies b/Polyhedron_IO/package_info/Polyhedron_IO/dependencies index b8678f37e1c..49dc8dde8a0 100644 --- a/Polyhedron_IO/package_info/Polyhedron_IO/dependencies +++ b/Polyhedron_IO/package_info/Polyhedron_IO/dependencies @@ -2,7 +2,6 @@ Algebraic_foundations BGL Circulator Distance_2 -Geomview HalfedgeDS Hash_map Installation diff --git a/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt index d042796fba0..df54844c7b7 100644 --- a/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt +++ b/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt @@ -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) diff --git a/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt index 187bada3b77..7499ccf9c83 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt +++ b/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt @@ -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() diff --git a/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt index e8d85bd9a6e..498476cdf5c 100644 --- a/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt +++ b/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt @@ -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() diff --git a/Property_map/examples/Property_map/CMakeLists.txt b/Property_map/examples/Property_map/CMakeLists.txt index be6fba245bf..08681627989 100644 --- a/Property_map/examples/Property_map/CMakeLists.txt +++ b/Property_map/examples/Property_map/CMakeLists.txt @@ -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() diff --git a/Ridges_3/examples/Ridges_3/CMakeLists.txt b/Ridges_3/examples/Ridges_3/CMakeLists.txt index 8eb75f8339a..b82b65141c5 100644 --- a/Ridges_3/examples/Ridges_3/CMakeLists.txt +++ b/Ridges_3/examples/Ridges_3/CMakeLists.txt @@ -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() diff --git a/Ridges_3/test/Ridges_3/CMakeLists.txt b/Ridges_3/test/Ridges_3/CMakeLists.txt index 2db2c27d54a..a04ffb65aa6 100644 --- a/Ridges_3/test/Ridges_3/CMakeLists.txt +++ b/Ridges_3/test/Ridges_3/CMakeLists.txt @@ -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( diff --git a/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt b/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt index 79737d882ed..def71918e36 100644 --- a/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt +++ b/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt @@ -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) diff --git a/Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/Alpha_shape_mesher.h b/Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/Alpha_shape_mesher.h index 19a20242b28..7cfdb245391 100644 --- a/Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/Alpha_shape_mesher.h +++ b/Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/Alpha_shape_mesher.h @@ -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 ]; diff --git a/Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/Weighted_PCA_smoother.h b/Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/Weighted_PCA_smoother.h index ee7c4eb18d5..bc4ba9ec616 100644 --- a/Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/Weighted_PCA_smoother.h +++ b/Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/Weighted_PCA_smoother.h @@ -23,7 +23,7 @@ #include #include -#include +#include #ifdef CGAL_LINKED_WITH_TBB #include "tbb/blocked_range.h" diff --git a/Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies b/Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies index 905e54313c1..4164cb98796 100644 --- a/Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies +++ b/Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies @@ -8,7 +8,6 @@ Circulator Distance_2 Distance_3 Filtered_kernel -Geomview HalfedgeDS Hash_map Homogeneous_kernel diff --git a/Scripts/developer_scripts/detect_packages_licenses b/Scripts/developer_scripts/detect_packages_licenses index a5cd34f30b3..485e1a74522 100755 --- a/Scripts/developer_scripts/detect_packages_licenses +++ b/Scripts/developer_scripts/detect_packages_licenses @@ -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 diff --git a/Shape_detection/benchmark/Shape_detection/CMakeLists.txt b/Shape_detection/benchmark/Shape_detection/CMakeLists.txt index 7c91cfd57ac..359f4c43c9c 100644 --- a/Shape_detection/benchmark/Shape_detection/CMakeLists.txt +++ b/Shape_detection/benchmark/Shape_detection/CMakeLists.txt @@ -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() diff --git a/Shape_detection/examples/Shape_detection/CMakeLists.txt b/Shape_detection/examples/Shape_detection/CMakeLists.txt index c59d88b829e..2bf4b6dfbe7 100644 --- a/Shape_detection/examples/Shape_detection/CMakeLists.txt +++ b/Shape_detection/examples/Shape_detection/CMakeLists.txt @@ -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() diff --git a/Shape_detection/examples/Shape_detection/region_growing_on_point_set_3.cpp b/Shape_detection/examples/Shape_detection/region_growing_on_point_set_3.cpp index a5392222d9d..10b6a9ab006 100644 --- a/Shape_detection/examples/Shape_detection/region_growing_on_point_set_3.cpp +++ b/Shape_detection/examples/Shape_detection/region_growing_on_point_set_3.cpp @@ -7,7 +7,7 @@ #include // Boost includes. -#include +#include // CGAL includes. #include diff --git a/Shape_detection/test/Shape_detection/CMakeLists.txt b/Shape_detection/test/Shape_detection/CMakeLists.txt index cfe7db967d8..fbbfad50b4a 100644 --- a/Shape_detection/test/Shape_detection/CMakeLists.txt +++ b/Shape_detection/test/Shape_detection/CMakeLists.txt @@ -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() diff --git a/Shape_detection/test/Shape_detection/test_validity_sampled_data.cpp b/Shape_detection/test/Shape_detection/test_validity_sampled_data.cpp index d603e50f1ee..78e6bb06069 100644 --- a/Shape_detection/test/Shape_detection/test_validity_sampled_data.cpp +++ b/Shape_detection/test/Shape_detection/test_validity_sampled_data.cpp @@ -18,7 +18,7 @@ #include -#include +#include namespace SD = CGAL::Shape_detection; diff --git a/Solver_interface/examples/Solver_interface/CMakeLists.txt b/Solver_interface/examples/Solver_interface/CMakeLists.txt index 7cbbdab9622..26abe18b449 100644 --- a/Solver_interface/examples/Solver_interface/CMakeLists.txt +++ b/Solver_interface/examples/Solver_interface/CMakeLists.txt @@ -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") diff --git a/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt b/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt index 996bc8b7be6..049a11792e8 100644 --- a/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt +++ b/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt @@ -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() diff --git a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt index cf8a147a739..b7102fc0a8b 100644 --- a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt +++ b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt @@ -8,7 +8,7 @@ project(Spatial_searching_Examples) find_package(CGAL REQUIRED) find_package(Eigen3 3.1.91) #(requires 3.2.0 or greater) -include(CGAL_Eigen_support) +include(CGAL_Eigen3_support) if(MSVC) # Turn off VC++ warning @@ -51,13 +51,13 @@ create_single_source_cgal_program("using_fair_splitting_rule.cpp") create_single_source_cgal_program("weighted_Minkowski_distance.cpp") -if(TARGET CGAL::Eigen_support) +if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("fuzzy_range_query.cpp") - target_link_libraries(fuzzy_range_query PUBLIC CGAL::Eigen_support) + target_link_libraries(fuzzy_range_query PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("general_neighbor_searching.cpp") - target_link_libraries(general_neighbor_searching PUBLIC CGAL::Eigen_support) + target_link_libraries(general_neighbor_searching PUBLIC CGAL::Eigen3_support) else() diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt index 88e88dc6690..b9db87e2998 100644 --- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt +++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt @@ -20,8 +20,8 @@ endif() # Use Eigen (for PCA) 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() @@ -33,20 +33,20 @@ endif() include(CGAL_CreateSingleSourceCGALProgram) create_single_source_cgal_program("vsa_approximation_2_example.cpp") -target_link_libraries(vsa_approximation_2_example PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_approximation_2_example PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_approximation_example.cpp") -target_link_libraries(vsa_approximation_example PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_approximation_example PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_class_interface_example.cpp") -target_link_libraries(vsa_class_interface_example PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_class_interface_example PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_isotropic_metric_example.cpp") -target_link_libraries(vsa_isotropic_metric_example PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_isotropic_metric_example PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_segmentation_example.cpp") -target_link_libraries(vsa_segmentation_example PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_segmentation_example PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_simple_approximation_example.cpp") target_link_libraries(vsa_simple_approximation_example - PUBLIC CGAL::Eigen_support) + PUBLIC CGAL::Eigen3_support) diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt index b9ef38f9f9e..2c2b89ec44f 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt @@ -20,8 +20,8 @@ endif() # Use Eigen (for PCA) 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() @@ -33,28 +33,28 @@ endif() include(CGAL_CreateSingleSourceCGALProgram) create_single_source_cgal_program("vsa_class_interface_test.cpp") -target_link_libraries(vsa_class_interface_test PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_class_interface_test PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_correctness_test.cpp") -target_link_libraries(vsa_correctness_test PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_correctness_test PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_error_decrease_test.cpp") -target_link_libraries(vsa_error_decrease_test PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_error_decrease_test PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_kernel_test.cpp") -target_link_libraries(vsa_kernel_test PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_kernel_test PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_approximation_test.cpp") -target_link_libraries(vsa_approximation_test PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_approximation_test PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_segmentation_test.cpp") -target_link_libraries(vsa_segmentation_test PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_segmentation_test PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_meshing_manifold_test.cpp") -target_link_libraries(vsa_meshing_manifold_test PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_meshing_manifold_test PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_metric_test.cpp") -target_link_libraries(vsa_metric_test PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_metric_test PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("vsa_teleportation_test.cpp") -target_link_libraries(vsa_teleportation_test PUBLIC CGAL::Eigen_support) +target_link_libraries(vsa_teleportation_test PUBLIC CGAL::Eigen3_support) diff --git a/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt b/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt index d23e2937686..4a4e8a179eb 100644 --- a/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt +++ b/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt @@ -6,10 +6,10 @@ 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(TARGET CGAL::Eigen_support) +include(CGAL_Eigen3_support) +if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("benchmark_for_concept_models.cpp") - target_link_libraries(benchmark_for_concept_models PUBLIC CGAL::Eigen_support) + target_link_libraries(benchmark_for_concept_models PUBLIC CGAL::Eigen3_support) else() message( STATUS diff --git a/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt index 2d0823d9166..a0e96402040 100644 --- a/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt +++ b/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt @@ -14,11 +14,11 @@ set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) find_package(CGAL REQUIRED) find_package(Eigen3 3.1.91) #(requires 3.2.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("deform_mesh_for_botsch08_format.cpp") target_link_libraries(deform_mesh_for_botsch08_format - PUBLIC CGAL::Eigen_support) + PUBLIC CGAL::Eigen3_support) else() message( STATUS diff --git a/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt index c02d2766bfc..011ab4ef342 100644 --- a/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt +++ b/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt @@ -7,8 +7,8 @@ project(Surface_mesh_deformation_Examples) find_package(CGAL REQUIRED) find_package(Eigen3 3.1.91) #(requires 3.2.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("all_roi_assign_example.cpp") create_single_source_cgal_program( "all_roi_assign_example_custom_polyhedron.cpp") @@ -32,7 +32,7 @@ if(TARGET CGAL::Eigen_support) k_ring_roi_translate_rotate_example k_ring_roi_translate_rotate_Surface_mesh deform_mesh_for_botsch08_format_sre_arap) - target_link_libraries(${target} PUBLIC CGAL::Eigen_support) + target_link_libraries(${target} PUBLIC CGAL::Eigen3_support) endforeach() find_package(OpenMesh QUIET) @@ -41,7 +41,7 @@ if(TARGET CGAL::Eigen_support) create_single_source_cgal_program( "all_roi_assign_example_with_OpenMesh.cpp") target_link_libraries(all_roi_assign_example_with_OpenMesh - PRIVATE ${OPENMESH_LIBRARIES} CGAL::Eigen_support) + PRIVATE ${OPENMESH_LIBRARIES} CGAL::Eigen3_support) else() message(STATUS "Example that use OpenMesh will not be compiled.") endif() diff --git a/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt index 236714e6444..cea07cbf2a8 100644 --- a/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt +++ b/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt @@ -7,21 +7,21 @@ project(Surface_mesh_deformation_Tests) find_package(CGAL REQUIRED) find_package(Eigen3 3.1.91) #(requires 3.2.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("Cactus_deformation_session.cpp") - target_link_libraries(Cactus_deformation_session PUBLIC CGAL::Eigen_support) + target_link_libraries(Cactus_deformation_session PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("Cactus_performance_test.cpp") - target_link_libraries(Cactus_performance_test PUBLIC CGAL::Eigen_support) + target_link_libraries(Cactus_performance_test PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("Symmetry_test.cpp") - target_link_libraries(Symmetry_test PUBLIC CGAL::Eigen_support) + target_link_libraries(Symmetry_test PUBLIC CGAL::Eigen3_support) find_package(OpenMesh QUIET) if(OpenMesh_FOUND) include(UseOpenMesh) create_single_source_cgal_program("Cactus_deformation_session_OpenMesh.cpp") target_link_libraries(Cactus_deformation_session_OpenMesh - PRIVATE ${OPENMESH_LIBRARIES} CGAL::Eigen_support) + PRIVATE ${OPENMESH_LIBRARIES} CGAL::Eigen3_support) else() message(STATUS "Example that use OpenMesh will not be compiled.") endif() diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt index 29fc96eb538..f0e3458aabc 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt @@ -7,8 +7,8 @@ project(Surface_mesh_parameterization_Examples) find_package(CGAL REQUIRED) 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 # ------------------------------------------------------------------ @@ -54,19 +54,19 @@ if(TARGET CGAL::Eigen_support) # ------------------------------------------------------------------ create_single_source_cgal_program("discrete_authalic.cpp") - target_link_libraries(discrete_authalic PUBLIC CGAL::Eigen_support) + target_link_libraries(discrete_authalic PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("lscm.cpp") - target_link_libraries(lscm PUBLIC CGAL::Eigen_support) + target_link_libraries(lscm PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("orbifold.cpp") - target_link_libraries(orbifold PUBLIC CGAL::Eigen_support) + target_link_libraries(orbifold PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("seam_Polyhedron_3.cpp") - target_link_libraries(seam_Polyhedron_3 PUBLIC CGAL::Eigen_support) + target_link_libraries(seam_Polyhedron_3 PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("simple_parameterization.cpp") - target_link_libraries(simple_parameterization PUBLIC CGAL::Eigen_support) + target_link_libraries(simple_parameterization PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("square_border_parameterizer.cpp") - target_link_libraries(square_border_parameterizer PUBLIC CGAL::Eigen_support) + target_link_libraries(square_border_parameterizer PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program( "iterative_authalic_parameterizer.cpp" ) - target_link_libraries(iterative_authalic_parameterizer PUBLIC CGAL::Eigen_support) + target_link_libraries(iterative_authalic_parameterizer PUBLIC CGAL::Eigen3_support) if(SuiteSparse_FOUND) target_link_libraries(orbifold PRIVATE ${SuiteSparse_LIBRARIES}) endif() diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h index 45a297e4bf3..3fb7edade43 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/ARAP_parameterizer_3.h @@ -81,7 +81,7 @@ #include // used to solve conic equations #endif -#include +#include #include #include #include diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Fixed_border_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Fixed_border_parameterizer_3.h index 1a4590353a3..c3b9d8de956 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Fixed_border_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Fixed_border_parameterizer_3.h @@ -33,7 +33,7 @@ #include #endif -#include +#include #include #include diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/IO/File_off.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/IO/File_off.h index de84771bc04..84fca87b11f 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/IO/File_off.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/IO/File_off.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h index 66369441365..38093049023 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Iterative_authalic_parameterizer_3.h @@ -41,7 +41,7 @@ #include #endif -#include +#include #include #include diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/LSCM_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/LSCM_parameterizer_3.h index 4ad502312aa..109bfd46196 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/LSCM_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/LSCM_parameterizer_3.h @@ -31,7 +31,7 @@ #endif #include -#include +#include #include #include diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h index 7a25244f443..876babb7bc1 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/Two_vertices_parameterizer_3.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/validity.h b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/validity.h index 21373631533..6c40995198d 100644 --- a/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/validity.h +++ b/Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/internal/validity.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt index 98de8be4f5b..4643d889342 100644 --- a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt @@ -7,11 +7,11 @@ project(Surface_mesh_parameterization_Tests) find_package(CGAL REQUIRED) 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("extensive_parameterization_test.cpp") target_link_libraries(extensive_parameterization_test - PUBLIC CGAL::Eigen_support) + PUBLIC CGAL::Eigen3_support) else() message( STATUS diff --git a/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt b/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt index dd5cf970e40..c114d6b083e 100644 --- a/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt +++ b/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt @@ -42,11 +42,11 @@ create_single_source_cgal_program("edge_collapse_bounded_normal_change.cpp") create_single_source_cgal_program("edge_collapse_visitor_surface_mesh.cpp") 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("edge_collapse_garland_heckbert.cpp") target_link_libraries(edge_collapse_garland_heckbert - PUBLIC CGAL::Eigen_support) + PUBLIC CGAL::Eigen3_support) else() message( STATUS diff --git a/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/CMakeLists.txt b/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/CMakeLists.txt index e2f9ca828d5..8ed19957527 100644 --- a/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/CMakeLists.txt +++ b/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/CMakeLists.txt @@ -27,9 +27,9 @@ 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) -if(NOT TARGET CGAL::Eigen_support) +if(NOT TARGET CGAL::Eigen3_support) message(STATUS "NOTICE: Eigen 3.2 (or greater) is not found.") endif() @@ -37,6 +37,6 @@ endif() # ########################################################## create_single_source_cgal_program("solver_benchmark.cpp") -target_link_libraries(solver_benchmark PUBLIC CGAL::Eigen_support) +target_link_libraries(solver_benchmark PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("mcf_scale_invariance.cpp") -target_link_libraries(mcf_scale_invariance PUBLIC CGAL::Eigen_support) +target_link_libraries(mcf_scale_invariance PUBLIC CGAL::Eigen3_support) diff --git a/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt b/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt index 5e93efaf7b4..c452a1aed19 100644 --- a/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt +++ b/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt @@ -7,9 +7,9 @@ project(Surface_mesh_skeletonization_Examples) find_package(CGAL REQUIRED) find_package(Eigen3 3.2.0) #(requires 3.2.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("simple_mcfskel_example.cpp") create_single_source_cgal_program("simple_mcfskel_sm_example.cpp") create_single_source_cgal_program("simple_mcfskel_LCC_example.cpp") @@ -26,7 +26,7 @@ if(TARGET CGAL::Eigen_support) MCF_Skeleton_sm_example MCF_Skeleton_LCC_example segmentation_example) - target_link_libraries(${target} PUBLIC CGAL::Eigen_support) + target_link_libraries(${target} PUBLIC CGAL::Eigen3_support) endforeach() else() message( diff --git a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt index b6abbe92f38..31d757c9183 100644 --- a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt +++ b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt @@ -7,13 +7,13 @@ project(Surface_mesh_skeletonization_Tests) find_package(CGAL REQUIRED) find_package(Eigen3 3.2.0) #(requires 3.2.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("MCF_Skeleton_test.cpp") - target_link_libraries(MCF_Skeleton_test PUBLIC CGAL::Eigen_support) + target_link_libraries(MCF_Skeleton_test PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("skeleton_connectivity_test.cpp") - target_link_libraries(skeleton_connectivity_test PUBLIC CGAL::Eigen_support) + target_link_libraries(skeleton_connectivity_test PUBLIC CGAL::Eigen3_support) else() message( STATUS diff --git a/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt b/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt index f797bcd0657..915f08fa948 100644 --- a/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt +++ b/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt @@ -18,7 +18,7 @@ endif() # Use Eigen for Mesh_3 find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater) -include(CGAL_Eigen_support) +include(CGAL_Eigen3_support) find_package(TBB QUIET) include(CGAL_TBB_support) @@ -37,7 +37,7 @@ create_single_source_cgal_program( "tetrahedral_remeshing_with_features.cpp") create_single_source_cgal_program( "tetrahedral_remeshing_of_one_subdomain.cpp") create_single_source_cgal_program( "tetrahedral_remeshing_from_mesh.cpp") create_single_source_cgal_program( "mesh_and_remesh_polyhedral_domain_with_features.cpp" ) -target_link_libraries(mesh_and_remesh_polyhedral_domain_with_features PUBLIC CGAL::Eigen_support) +target_link_libraries(mesh_and_remesh_polyhedral_domain_with_features PUBLIC CGAL::Eigen3_support) if(CGAL_ACTIVATE_CONCURRENT_MESH_3 AND TARGET CGAL::TBB_support) target_link_libraries(mesh_and_remesh_polyhedral_domain_with_features PRIVATE CGAL::TBB_support) endif() diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h index 5f7f34dfb7e..526d9dd7d82 100644 --- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h +++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h @@ -1174,7 +1174,7 @@ bool can_be_collapsed(const typename C3T3::Edge& e, } else { - return true; + return is_selected(e, c3t3, cell_selector); } } diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h index 1d94ef35e1d..d22d6fdf65c 100644 --- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h +++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/smooth_vertices.h @@ -437,6 +437,7 @@ public: boost::unordered_map vertex_id; std::vector smoothed_positions(nbv, CGAL::NULL_VECTOR); std::vector neighbors(nbv, -1); + std::vector free_vertex(nbv, false);//are vertices free to move? indices are in `vertex_id` //collect ids std::size_t id = 0; @@ -450,10 +451,14 @@ public: inc_cells(nbv, boost::container::small_vector()); for (const Cell_handle c : tr.finite_cell_handles()) { + const bool cell_is_selected = cell_selector(c); + for (int i = 0; i < 4; ++i) { const std::size_t idi = vertex_id[c->vertex(i)]; inc_cells[idi].push_back(c); + if(cell_is_selected) + free_vertex[idi] = true; } } @@ -498,6 +503,9 @@ public: for (Vertex_handle v : tr.finite_vertex_handles()) { const std::size_t& vid = vertex_id.at(v); + if (!free_vertex[vid]) + continue; + if (neighbors[vid] > 1) { Vector_3 smoothed_position = smoothed_positions[vid] / neighbors[vid]; @@ -613,10 +621,10 @@ public: for (Vertex_handle v : tr.finite_vertex_handles()) { - if (v->in_dimension() != 2) + const std::size_t& vid = vertex_id.at(v); + if (!free_vertex[vid] || v->in_dimension() != 2) continue; - const std::size_t& vid = vertex_id.at(v); if (neighbors[vid] > 1) { Vector_3 smoothed_position = smoothed_positions[vid] / static_cast(neighbors[vid]); @@ -697,6 +705,9 @@ public: for (Vertex_handle v : tr.finite_vertex_handles()) { const std::size_t& vid = vertex_id.at(v); + if (!free_vertex[vid]) + continue; + if (c3t3.in_dimension(v) == 3 && neighbors[vid] > 1) { #ifdef CGAL_TETRAHEDRAL_REMESHING_DEBUG diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/split_long_edges.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/split_long_edges.h index 9f2b553eeba..d0d3c12f442 100644 --- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/split_long_edges.h +++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/split_long_edges.h @@ -224,7 +224,7 @@ bool can_be_split(const typename C3T3::Edge& e, } else { - return true; + return is_selected(e, c3t3, cell_selector); } } diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_remeshing_helpers.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_remeshing_helpers.h index fe9ad654d14..80f3f7c7311 100644 --- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_remeshing_helpers.h +++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/tetrahedral_remeshing_helpers.h @@ -775,6 +775,7 @@ bool is_outside(const typename C3t3::Edge & edge, return true; //all incident cells are outside or infinite } +// is `v` part of the selection of cells that should be remeshed? template bool is_selected(const typename C3t3::Vertex_handle v, const C3t3& c3t3, @@ -823,6 +824,24 @@ bool is_internal(const typename C3t3::Edge& edge, return true; } +// is `e` part of the selection of cells that should be remeshed? +template +bool is_selected(const typename C3T3::Triangulation::Edge& e, + const C3T3& c3t3, + CellSelector cell_selector) +{ + typedef typename C3T3::Triangulation::Cell_circulator Cell_circulator; + Cell_circulator circ = c3t3.triangulation().incident_cells(e); + Cell_circulator done = circ; + do + { + if (cell_selector(circ)) + return true; + } while (++circ != done); + + return false; +} + template void normalize(typename Gt::Vector_3& v, const Gt& gt) { diff --git a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt index 69ffa77d16c..e6a8b631884 100644 --- a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt +++ b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt @@ -29,8 +29,8 @@ create_single_source_cgal_program( # Tests using Mesh_3 require 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() @@ -39,9 +39,9 @@ endif() create_single_source_cgal_program( "test_mesh_and_remesh_polyhedral_domain_with_features.cpp") target_link_libraries(test_mesh_and_remesh_polyhedral_domain_with_features - PUBLIC CGAL::Eigen_support) + PUBLIC CGAL::Eigen3_support) if(CGAL_ImageIO_USE_ZLIB) create_single_source_cgal_program("test_mesh_and_remesh_image.cpp") - target_link_libraries(test_mesh_and_remesh_image PUBLIC CGAL::Eigen_support) + target_link_libraries(test_mesh_and_remesh_image PUBLIC CGAL::Eigen3_support) endif() diff --git a/Triangulation/applications/Triangulation/CMakeLists.txt b/Triangulation/applications/Triangulation/CMakeLists.txt index 3c3de41bc4e..57cb2de2f90 100644 --- a/Triangulation/applications/Triangulation/CMakeLists.txt +++ b/Triangulation/applications/Triangulation/CMakeLists.txt @@ -20,7 +20,7 @@ if(NOT Boost_FOUND) endif() find_package(Eigen3 3.1.0) -include(CGAL_Eigen_support) +include(CGAL_Eigen3_support) # include for local directory include_directories(BEFORE include) @@ -31,6 +31,6 @@ include_directories(BEFORE include) # ########################################################## create_single_source_cgal_program("points_to_RT_to_off.cpp") -target_link_libraries(points_to_RT_to_off PUBLIC CGAL::Eigen_support) +target_link_libraries(points_to_RT_to_off PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("points_to_DT_to_off.cpp") -target_link_libraries(points_to_DT_to_off PUBLIC CGAL::Eigen_support) +target_link_libraries(points_to_DT_to_off PUBLIC CGAL::Eigen3_support) diff --git a/Triangulation/benchmark/Triangulation/CMakeLists.txt b/Triangulation/benchmark/Triangulation/CMakeLists.txt index 79c84e05cb7..54d7db39a3f 100644 --- a/Triangulation/benchmark/Triangulation/CMakeLists.txt +++ b/Triangulation/benchmark/Triangulation/CMakeLists.txt @@ -9,13 +9,13 @@ find_package(CGAL REQUIRED COMPONENTS Core) include(${CGAL_USE_FILE}) find_package(Eigen3 3.1.0) -include(CGAL_Eigen_support) -if(TARGET CGAL::Eigen_support) +include(CGAL_Eigen3_support) +if(TARGET CGAL::Eigen3_support) include_directories(BEFORE "include") create_single_source_cgal_program("delaunay.cpp") - target_link_libraries(delaunay PUBLIC CGAL::Eigen_support) + target_link_libraries(delaunay PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("Td_vs_T2_and_T3.cpp") - target_link_libraries(Td_vs_T2_and_T3 PUBLIC CGAL::Eigen_support) + target_link_libraries(Td_vs_T2_and_T3 PUBLIC CGAL::Eigen3_support) else() message( diff --git a/Triangulation/examples/Triangulation/CMakeLists.txt b/Triangulation/examples/Triangulation/CMakeLists.txt index 0294d48817b..4d6587a7f27 100644 --- a/Triangulation/examples/Triangulation/CMakeLists.txt +++ b/Triangulation/examples/Triangulation/CMakeLists.txt @@ -15,8 +15,8 @@ endif() find_package(CGAL REQUIRED) 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("barycentric_subdivision.cpp") create_single_source_cgal_program("delaunay_triangulation.cpp") create_single_source_cgal_program("convex_hull.cpp") @@ -34,7 +34,7 @@ if(TARGET CGAL::Eigen_support) triangulation triangulation_data_structure_dynamic triangulation_data_structure_static) - target_link_libraries(${target} PUBLIC CGAL::Eigen_support) + target_link_libraries(${target} PUBLIC CGAL::Eigen3_support) endforeach() else() message( diff --git a/Triangulation/test/Triangulation/CMakeLists.txt b/Triangulation/test/Triangulation/CMakeLists.txt index 38538a731ea..a21d7eab39a 100644 --- a/Triangulation/test/Triangulation/CMakeLists.txt +++ b/Triangulation/test/Triangulation/CMakeLists.txt @@ -15,8 +15,8 @@ endif() find_package(CGAL REQUIRED) find_package(Eigen3 3.1.0) -include(CGAL_Eigen_support) -if(TARGET CGAL::Eigen_support) +include(CGAL_Eigen3_support) +if(TARGET CGAL::Eigen3_support) include_directories(BEFORE "include") create_single_source_cgal_program("test_triangulation.cpp") @@ -27,7 +27,7 @@ if(TARGET CGAL::Eigen_support) create_single_source_cgal_program("test_insert_if_in_star.cpp") foreach(target test_triangulation test_delaunay test_regular test_tds test_torture test_insert_if_in_star) - target_link_libraries(${target} PUBLIC CGAL::Eigen_support) + target_link_libraries(${target} PUBLIC CGAL::Eigen3_support) endforeach() else() diff --git a/Triangulation_2/package_info/Triangulation_2/dependencies b/Triangulation_2/package_info/Triangulation_2/dependencies index 90dd0267b28..c8d90b721ca 100644 --- a/Triangulation_2/package_info/Triangulation_2/dependencies +++ b/Triangulation_2/package_info/Triangulation_2/dependencies @@ -6,7 +6,6 @@ Circulator Distance_2 Distance_3 Filtered_kernel -Geomview GraphicsView Hash_map Homogeneous_kernel diff --git a/Triangulation_3/package_info/Triangulation_3/dependencies b/Triangulation_3/package_info/Triangulation_3/dependencies index e22da1bafd7..53da26a4122 100644 --- a/Triangulation_3/package_info/Triangulation_3/dependencies +++ b/Triangulation_3/package_info/Triangulation_3/dependencies @@ -6,7 +6,6 @@ Circulator Distance_2 Distance_3 Filtered_kernel -Geomview GraphicsView Hash_map Homogeneous_kernel