Commit Graph

4117 Commits

Author SHA1 Message Date
Laurent Rineau daf86cc719 Prepare for 5.1-beta1 2020-06-04 09:42:02 +02:00
Mael Rouxel-Labbé e49babecfb Formatting... 2020-06-03 17:50:08 +02:00
Mael Rouxel-Labbé 6607b48dda Add an entry in CHANGES.md about the tutorials 2020-06-03 17:47:55 +02:00
Mael Rouxel-Labbé d81184ca9f Add links to entries on cgal.org 2020-06-03 17:47:40 +02:00
Mael Rouxel-Labbé 09fa7feef2 Misc minor fixes 2020-06-03 17:39:29 +02:00
Mael Rouxel-Labbé 02f8063111 Add Tetrahedral Remeshing to CHANGES.md 2020-06-03 17:27:44 +02:00
Mael Rouxel-Labbé 4a9618f62c Add missing links 2020-06-03 17:11:38 +02:00
Mael Rouxel-Labbé 97bebb5b0f Merge remote-tracking branch 'cgal/master' into CGAL-Format_CHANGES.md_5.1-GF 2020-06-03 17:01:40 +02:00
Laurent Rineau a828cb0d06 Merge pull request #4620 from janetournois/Tetrahedral_remeshing-new-jtournois
Tetrahedral remeshing - new package
2020-06-03 16:23:17 +02:00
Laurent Rineau 8db4503904 Merge pull request #4710 from danston/CGAL-clangmp_bug_fix-danston
boost mp on Apple clang issue fix

# Conflicts:
#	Installation/cmake/modules/CGAL_SetupCGALDependencies.cmake
2020-06-03 16:22:55 +02:00
Laurent Rineau 4354b2c87f Merge pull request #4710 from danston/CGAL-clangmp_bug_fix-danston
boost mp on Apple clang issue fix
2020-06-03 16:21:28 +02:00
Laurent Rineau 4dba18fe9d Merge pull request #4710 from danston/CGAL-clangmp_bug_fix-danston
boost mp on Apple clang issue fix
2020-06-03 16:11:23 +02:00
Maxime Gimeno 3356d066cc fix boost zlib targets 2020-06-02 15:31:55 +02:00
Maxime Gimeno 4af1e73f69 Work around for moc bug 2020-06-02 10:12:10 +02:00
Laurent Rineau dc4427c998 Move the code in CGAL_SetupCGALDependencies.cmake 2020-05-28 12:44:25 +02:00
Simon Giraudot b2fe891802 Fix cmake 2020-05-28 08:59:18 +02:00
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +02:00
Laurent Rineau 7173530dad Merge pull request #4557 from lrineau/NewKernel_d-det-GF-CGAL-5.0
NewKernel_d: Accelerate by using Mpzf instead of Gmpq (CGAL-5.0 and later)
2020-05-27 18:27:56 +02:00
Laurent Rineau 88250aee80 Merge pull request #4557 from lrineau/NewKernel_d-det-GF-CGAL-5.0
NewKernel_d: Accelerate by using Mpzf instead of Gmpq (CGAL-5.0 and later)
2020-05-27 18:20:14 +02:00
Laurent Rineau b4f2295bab Merge pull request #4555 from afabri/NewKernel_d-det-GF
NewKernel_d: Accelerate by using Mpzf instead of Gmpq (for CGAL-4.14.x)
2020-05-27 18:15:30 +02:00
Laurent Rineau b294b39d7e Merge pull request #4709 from maxGimeno/Surface_mesh-Clear_removes_the_maps-maxGimeno
Surface_mesh: fix clear()
2020-05-27 16:33:30 +02:00
Dmitry Anisimov 69d174571a added the missing macros include 2020-05-25 11:25:01 +02:00
Maxime Gimeno 3ab72f217a Add 'breaking change' to the change log 2020-05-25 09:07:48 +02:00
Laurent Rineau 0e3db8c815 Merge pull request #4659 from sgiraudot/PSP-Enhance_remove_outliers-GF
[Small Feature] Parallel Outlier Removal
2020-05-22 16:39:32 +02:00
Laurent Rineau b70dcffbd7 Merge pull request #4697 from lrineau/Installation-add_CGALConfigVersion-GF
header-only mode: add CGALConfigVersion.cmake
2020-05-22 16:39:28 +02:00
Laurent Rineau f27ea0bfb3 Merge pull request #4737 from jingyangcarl/master
add include of other modules
2020-05-22 16:39:25 +02:00
Laurent Rineau 851c67a740 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-05-22 16:39:00 +02:00
Laurent Rineau a56a052bca Merge pull request #4743 from AdrianBunk/CGAL-5.0-branch
Fix gcc option setting for Alpha
2020-05-22 10:35:56 +02:00
Adrian Bunk 5e70fceba9 Fix gcc option setting for Alpha 2020-05-22 11:21:58 +03:00
Jing Yang b495c00450 add include of other modules 2020-05-19 23:42:56 -07:00
Laurent Rineau 6b05f820e7 Markdown formatting of code 2020-05-19 20:28:29 +02:00
Laurent Rineau 3d3788925b Merge pull request #4607 from efifogel/Aos_2-intersection-efif
Arrangement_on_surface_2: change intersection return types (from legacy CGAL::Object to variants)

# Conflicts:
#	Installation/CHANGES.md
2020-05-19 10:55:30 +02:00
Simon Giraudot 700631da33 Update CHANGES.md 2020-05-18 13:56:31 +02:00
Simon Giraudot 5a95259849 Fix for cmake > 3.11 2020-05-18 13:40:31 +02:00
Maxime Gimeno 380e7c579e Update doc and CHANGES.MD 2020-05-18 12:25:28 +02:00
Laurent Rineau bb012da683 Merge pull request #4568 from sgiraudot/PSP-Cluster_points-GF
[Small Feature] Point Set Clustering
2020-05-18 12:24:56 +02:00
Laurent Rineau 81c1b96217 Merge branch 'releases/CGAL-5.0-branch' 2020-05-18 12:01:39 +02:00
Laurent Rineau 0ed0741489 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-05-18 11:59:20 +02:00
Laurent Rineau 3a2b250626 Fix a warning
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.1-Ic-152/Installation/TestReport_Friedrich_Ubuntu-gcc-7.gz
```
CMake Warning at /home/gimeno/foutoir/cgal_root/CGAL-5.1-Ic-152/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake:99 (message):
  =======================================================================

  CGAL performance notice:

  The variable CMAKE_BUILD_TYPE is set to "".  For performance reasons, you
  should set CMAKE_BUILD_TYPE to "Release".

  Set CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE to TRUE if you want to disable
  this warning.

  =======================================================================
Call Stack (most recent call first):
  CMakeLists.txt:9223372036854775807 (CGAL_run_at_the_end_of_configuration)
```
2020-05-18 11:43:59 +02:00
Jane Tournois b6912d92ea fix warnings
- move #define a better location
- conversion double/size_t
- unused parameters
- automatic conversion int/boolean
2020-05-15 13:54:19 +02:00
Jane Tournois 3d5fc5c1ca silent warning "STL4009: std::allocator<void> is deprecated in C++17."
from boost-1_71\boost/bimap/detail/manage_additional_parameters.hpp(86):
warning C4996: 'std::allocator<void>': warning STL4009: std::allocator<void>
 is deprecated in C++17.
You can define _SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING or
_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS
to acknowledge that you have received this warning.

see https://github.com/boostorg/beast/issues/1272
it seems that this warning is an error in msvc
2020-05-14 13:51:41 +02:00
Laurent Rineau 252b58d39f Change the version compatibility to SameMajorVersion
and change the testsuite
2020-05-14 11:26:00 +02:00
Laurent Rineau d85396c148 Make CGAL relocatable again
It will be relocatable if the user does not change
`CGAL_INSTALL_CMAKE_DIR` from its default.
2020-05-14 11:10:04 +02:00
Laurent Rineau f4cf19f64b Cosmetic: use variables from GNUInstallDirs instead of our guesses 2020-05-14 10:55:56 +02:00
Laurent Rineau f12f6f5f08 Fix #4720 2020-05-13 21:22:07 +02:00
Laurent Rineau d30dfacf5f Fix the testsuite of test/Installation/ with CTest 2020-05-13 21:15:55 +02:00
Laurent Rineau 7d64c59b86 Fix the lack of LABEL for test_find_package_version_* 2020-05-13 21:15:34 +02:00
Mael Rouxel-Labbé 01d5e5f2b8 Add CGAL_NO_UNIQUE_ADDRESS 2020-05-12 12:53:59 +02:00
Dmitry Anisimov 2ef4e362c1 integrated review for the fix 2020-05-11 11:29:54 +02:00
Maxime Gimeno 171ef5a0e7 Fix CHANGES.MD for file_input 2020-05-11 10:10:49 +02:00
Mael Rouxel-Labbé afade6d87a Fix a number of issues in CHANGES.md-CGAL 5.1 and add links 2020-05-09 11:30:01 +02:00
Dmitry Anisimov fc13a42db5 added a comment and info message 2020-05-08 11:41:34 +02:00
Dmitry Anisimov ec57a2af5b modified cmakelists to fix the boost mp on clang issue #3816 2020-05-07 15:18:08 +02:00
Laurent Rineau 15f0171013 Fix for the case where CGAL is configured 2020-05-06 13:36:38 +02:00
Laurent Rineau abf414df81 Change create_new_release to use CGALConfigVersion.cmake as input 2020-05-06 13:36:38 +02:00
Laurent Rineau 4092727cf8 Fix CGAL_parse_version_h.cmake when the minor version is less than 10 2020-05-06 13:36:38 +02:00
Simon Giraudot 67adcb9673 Update CHANGES.md 2020-05-06 09:01:07 +02:00
Sebastien Loriot c602038db9
Merge pull request #4559 from sgiraudot/Spatial_searching-Parallelize_kd_tree_build-GF
[Small Feature] Parallelize KD Tree build
2020-05-05 14:35:02 +02:00
Sebastien Loriot c67ef14d3c
Merge pull request #4675 from sloriot/AABB_tree-cpp11DCL
Make the kd-tree build really lazy and fix thread safety of builds
2020-05-05 14:27:57 +02:00
Laurent Rineau f4581c2b13 Add CGALConfigVersion.cmake, and CTest tests 2020-05-01 15:00:35 +02:00
Sebastien Loriot 2d3e126450
Merge pull request #4602 from gdamiand/gsoc2019-nccycles-thien
Surface mesh topology shortest cycle
2020-04-29 09:10:37 +02:00
Sébastien Loriot 6904761116 update CHANGES 2020-04-27 18:55:27 +02:00
Guillaume Damiand 84b157aa04 Doc after Sebastien review. 2020-04-27 18:55:26 +02:00
Guillaume Damiand 037ef0497c Doc + changes 2020-04-27 18:55:25 +02:00
Simon Giraudot e0936d233d Update CHANGES.md 2020-04-27 10:29:34 +02:00
Sebastien Loriot 0325219ce6
Merge pull request #4671 from maxGimeno/DGAL-Fix_MIN_MAX_issues-maxGimeno
CGAL: Min-max errors on windows
2020-04-27 09:46:04 +02:00
Sebastien Loriot 74d44ff97f
Merge pull request #4672 from maxGimeno/CGAL_Fix_MIN_MAX_5_0-maxGimeno
CGAL: Fixes for min/max 5.0
2020-04-27 09:45:35 +02:00
Sebastien Loriot 1c05c79244
Merge pull request #4673 from maxGimeno/CGAL_Fix_MIN_MAX_4_14-maxGimeno
CGAL: Fixes for min/max 4.14
2020-04-27 09:45:16 +02:00
Sébastien Loriot dc6cc9da35 update changes 2020-04-22 15:14:56 +02:00
Sébastien Loriot c5af2b25f3 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-22 13:27:29 +02:00
Sébastien Loriot 157bdbda08 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-04-22 13:26:52 +02:00
Sebastien Loriot e38f9c2195
Merge pull request #4633 from maxGimeno/Three-move_examples-maxGimeno
Three: Move examples to the Polyhedron_Demo
2020-04-22 13:20:32 +02:00
Maxime Gimeno 5b2d46cfa0 Fixes for min/max 2020-04-21 12:04:45 +02:00
Maxime Gimeno 50766d9d03 Fixes for min/max 2020-04-21 11:52:56 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
Simon Giraudot 1dd6a665a1 Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-04-20 09:09:32 +02:00
Jane Tournois cf58a08a55 Merge branch 'master' into Tetrahedral_remeshing-new-jtournois 2020-04-20 06:24:36 +02:00
Sebastien Loriot a860a7ea5a
Merge pull request #4404 from MaelRL/CGAL-Optimal_bounding_box-GF
New Package: Optimal Bounding Box
2020-04-16 18:10:58 +02:00
Mael 67444beca5
Add a notice of the removal of convex_hull_3_to_polyhedron_3 2020-04-16 18:09:29 +02:00
Mael 3341b69e6a Update CHANGES.md 2020-04-16 17:55:45 +02:00
Sebastien Loriot e62a1abf0f
Merge pull request #4623 from sgiraudot/Classification-Allow_compilation_without_iostreams_serialization-GF
Allow Classification package to be used without Boost IO Stream and Serialization
2020-04-16 16:36:59 +02:00
Sebastien Loriot 5594c95eb9
Merge pull request #4597 from sgiraudot/PMP-Regularize_selection_borders-GF
[Small Feature] BGL: Regularize Face Selection Borders
2020-04-16 16:33:35 +02:00
Maxime Gimeno 75152e76d2 Add switch in dependency script 2020-04-16 16:29:42 +02:00
Simon Giraudot a3ee4ac9fc Update changes.md 2020-04-16 16:21:08 +02:00
Simon Giraudot 3668a22d89 Update deprecation warnings 2020-04-15 14:06:13 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Simon Giraudot 41519e3010 Proposal for imported targets 2020-04-15 14:05:18 +02:00
Mael Rouxel-Labbé c16c1a7ea3 Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-04-10 16:10:11 +02:00
Sébastien Loriot 825f77baaa add license include directives 2020-04-10 14:14:30 +02:00
Maxime Gimeno 55f7ed028c Add file to whitelist 2020-04-09 15:05:22 +02:00
Sebastien Loriot 2167d4ffef
Merge pull request #4454 from maxGimeno/TDS-file_input-maxGimeno
Triangulation_3: Add a function to file_input() with a similar API to the advanced copy_tds()
2020-04-08 16:09:36 +02:00
Simon Giraudot 7cfe6df8e3 Allow classification package to be used without Boost IO Stream and Serialization 2020-04-07 11:02:16 +02:00
Mael fdecf6db28
Merge branch 'master' into Aos_2-intersection-efif 2020-04-07 09:34:35 +02:00
Efi Fogel f05f53a74f Refined description of the change in the intersection return type of 2d arrangements 2020-04-06 16:49:51 +03:00
Efi Fogel 52caec6d82 Fixed typo; Improved format 2020-04-06 16:42:27 +03:00
Efi Fogel 3d42c79d85 Announced the Change of intersection return type from legacy CGAL::Object to modern boost::variant 2020-04-06 15:59:03 +03:00
Simon Giraudot 25c7c570eb Update CHANGES.md 2020-04-06 09:05:29 +02:00
Sebastien Loriot 560243e72a
Merge pull request #4198 from afabri/Distance-robustify-GF
Make 2d segment segment distance more robust for kernel with inexact constructions
2020-04-02 15:01:46 +02:00
Maxime Gimeno e02a3fc37e Merge remote-tracking branch 'cgal/master' into TDS-file_input-maxGimeno 2020-04-02 15:00:23 +02:00
Maxime Gimeno 383eb3d147 Merge tag 'master_before_no_tws_nor_tabs' into TDS-file_input-maxGimeno 2020-04-02 14:56:03 +02:00
Andreas Fabri fcb25ae136 Add change entry 2020-04-02 13:30:04 +01:00
Andreas Fabri f595a34959 Add change entry 2020-04-02 14:27:16 +02:00
Sébastien Loriot 950ce31a0c Merge pull request #4180 from maxGimeno/Doc_enhancements_and_clarifications-GF
PMP: Add a function to sample a triangle soup.
2020-04-02 14:10:42 +02:00
Sébastien Loriot b0a1e84c07 Merge pull request #4104 from sgiraudot/BGL-Alpha_expansion_graphcut-GF
BGL: Alpha Expansion Graphcut
2020-04-02 14:00:16 +02:00
Maxime Gimeno 9689a1c1a3 Merge remote-tracking branch 'cgal/master' into Doc_enhancements_and_clarifications-GF 2020-03-27 16:16:47 +01:00
Maxime Gimeno 5ff8d88151 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-27 16:15:38 +01:00
Maxime Gimeno b13e863065 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-27 16:12:19 +01:00
Sébastien Loriot 5c5d445eb3 Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:27:43 +01:00
Sébastien Loriot c67d093ebf Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:28:07 +01:00
Sébastien Loriot 35b83deffd Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:16:25 +01:00
Sébastien Loriot 92f5f0242e Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:04:33 +01:00
Sébastien Loriot 4421fff65f Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:58:50 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Mael Rouxel-Labbé 54d41c816b Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-24 12:03:07 +01:00
Mael 855003baa1
Merge branch 'master' into BGL-Alpha_expansion_graphcut-GF 2020-03-24 08:18:23 +01:00
Sebastien Loriot 6d2ada806c
Merge pull request #4153 from necipfazil/gsoc2019-pointmatcher_icp_wrapper-necipfazil
[Small Feature] OpenGR and PointMatcher wrappers
2020-03-23 13:35:48 +01:00
Laurent Rineau 2f4e49bfff Fix forward-declarations of CGAL::Surface_mesh
In the forward-declaration, the template parameters do not matter, but
they do if the code is read by an IDE (with IntelliSense for example).
2020-03-23 09:47:01 +01:00
Mael Rouxel-Labbé 2556196dad Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-23 08:59:49 +01:00
Sébastien Loriot eb5d1d9a95 Update from master 2020-03-20 08:58:52 +01:00
Mael de563e9844
Merge branch 'master' into PMP-new_functions-GF 2020-03-20 08:48:39 +01:00
Sébastien Loriot 954d23a64c Merge pull request #4418 from sloriot/PMP-soup_to_mesh_add_vpm
PMP: Add `point_map` and `vertex_point_map` to `polygon_soup_to_polygon_mesh`
2020-03-19 16:22:58 +01:00
Mael ddc13ecd69
Update CHANGES.md 2020-03-19 16:07:57 +01:00
Sébastien Loriot 8eeee9c9a8 Update from master after default initialized index maps
Merge-commit + default map fixes
2020-03-18 08:10:54 +01:00
Mael 8ee3ec8f7b
Merge branch 'master' into PMP-Add_split_to_clip-GF 2020-03-17 19:47:28 +01:00
Sebastien Loriot 1454b9903c
Merge pull request #4209 from maxGimeno/PMP-Default_pmap-maxGimeno
PMP: Default Property_maps for Index_maps
2020-03-17 18:27:55 +01:00
Mael 7406e48f98
Update CHANGES.md 2020-03-17 18:22:38 +01:00
Sébastien Loriot cc1bd20c7c Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF
Third party libs: improve documentation + introduce new CMake functions
2020-03-17 18:19:40 +01:00
Sébastien Loriot 08872b80d0 try to fix conflict with master 2020-03-17 16:10:13 +01:00
Sébastien Loriot 60a846a04b update changes 2020-03-17 11:19:35 +01:00
Sebastien Loriot 0c8e9cb0c1
Merge pull request #4212 from maxGimeno/Demo-Save_the_scene_entirely-maxGimeno
CGAL 3D Demo: Enhancement of the Scene Saving System
2020-03-16 16:35:45 +01:00
Sébastien Loriot 32813dc976 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-16 16:32:47 +01:00
Maxime Gimeno 2424d54e30 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-12 12:10:44 +01:00
Laurent Rineau 41316e25ef Protect MSVC specific compilation flags with $<COMPILE_LANGUAGE:CXX>
Fix issue #4571
2020-03-11 09:57:46 +01:00
Mael Rouxel-Labbé 3e365756ca Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2020-03-09 16:54:25 +01:00
Ahmed Essam a3f0452771 Update CHANGES.md 2020-03-07 04:36:59 +02:00
Laurent Rineau 0dfd416395 Use [[noreturn]] directly 2020-03-06 09:26:54 +01:00
Simon Giraudot feaa8ce598 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-03-05 15:58:17 +01:00
Laurent Rineau 57e699ac67 Merge pull request #4502 from maxGimeno/Convex_hull_3-Overload_for_VertexListGraph-maxGimeno
Convex_hull_3: Overload for VertexListGraph
2020-03-05 14:52:25 +01:00
Maxime Gimeno 14669c213c Doc 2020-02-26 12:32:05 +01:00
Laurent Rineau 2b01447391 Next release on this branch will be 5.0.3 2020-02-25 09:46:40 +01:00
Laurent Rineau e40aaafd28 Next release in this branch will be 4.14.4 2020-02-25 09:43:08 +01:00
Maxime Gimeno d8fd359399 Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno 2020-02-24 16:41:34 +01:00
Laurent Rineau e828e60b8d Merge pull request #4521 from maxGimeno/Installation-Fix_CGAL_WITH_Qt5-maxGimeno
Fix CGAL_Qt5_FOUND issue
2020-02-14 14:39:11 +01:00
Maxime Gimeno 2dbce59bd8 Merge remote-tracking branch 'cgal/master' into Convex_hull_3-Overload_for_VertexListGraph-maxGimeno 2020-02-14 09:21:38 +01:00
Maxime Gimeno 1955510176 Add CHANGES.md 2020-02-13 15:31:49 +01:00
Maxime Gimeno 8645e59f00 Fix Qt5 COMPONENT installation and don't copy Qt/* at installation step. 2020-02-12 14:24:29 +01:00
Maxime Gimeno 0378d7825f Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF 2020-02-10 15:53:05 +01:00
Maxime Gimeno a357a90b1f Changes after review 2020-02-10 15:49:54 +01:00
Maxime Gimeno 4716359ca6 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-02-10 14:29:56 +01:00
Simon Giraudot 00b1f51b24 Move find_package() to function to avoid polluting global cmake variables 2020-02-10 11:57:56 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Laurent Rineau 97a8128f06 Merge pull request #4271 from maxGimeno/Installation-GMPXX-maxGimeno
Set GMPXX ON if detected
2020-02-07 16:25:11 +01:00
Laurent Rineau 541caf58cf Merge pull request #4330 from afabri/Spatial_sort-parallel-GF
Spatial_sorting: Parallelize Median Policy (2D & 3D)
2020-02-07 16:25:08 +01:00
Laurent Rineau 49a06e9201 Merge pull request #4362 from afabri/Box_intersection_d-accelerate-GF
PMP::self_intersections: Add Concurrency
2020-02-07 16:25:06 +01:00
Mael 5c9eb2fdfe
Update CHANGES.md 2020-02-07 11:10:15 +01:00
Mael 8ac61eae0d
Update CHANGES.md 2020-02-07 10:58:47 +01:00
Maxime Gimeno a3e60c8475 update CHANGES.md 2020-01-31 14:29:41 +01:00
Mael 6cd0be2707
Update changes.md 2020-01-29 16:49:52 +01:00
Maxime Gimeno 438826380d Clean-up after review 2020-01-28 10:44:36 +01:00
Maxime Gimeno 19a77a50ef Finish doc 2020-01-28 10:41:52 +01:00
Maxime Gimeno 1f0d062c10 Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF 2020-01-27 12:51:26 +01:00
Laurent Rineau 7868c454e7 Next version on this branch will be 5.0.2 2020-01-27 11:24:09 +01:00
Michel Zou 17a58a5625 version.h: workaround for SWIG parsing 2020-01-17 16:36:35 +01:00
Michel Zou f86b948845 version.h: workaround for SWIG parsing 2020-01-17 16:32:07 +01:00
Laurent Rineau d26c2e9e53 Merge pull request #4475 from lrineau/Installation-workaround_for_SWIG_parser-xantares-lrineau
Workaround for SWIG parser
2020-01-17 16:26:13 +01:00
Simon Giraudot 5daa73c9bc Use CGAL_target_use_* mechanism for OpenGR and pointmatcher 2020-01-16 16:12:34 +01:00
Simon Giraudot 3cd8207f51 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-01-16 12:03:49 +01:00
Laurent Rineau 84cd4ee1fa Merge pull request #4370 from maxGimeno/Demo-Improve_3mf_detection-maxGimeno
Add PATHS to find_path 3mf
2020-01-15 17:32:07 +01:00
Laurent Rineau 67b1b0e04f Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand
Surface mesh topology (new package)
2020-01-15 17:24:06 +01:00
Laurent Rineau 631e383e20 Merge pull request #4132 from MaelRL/PMP-Remove_small_CCs
PMP: remove small connected components
2020-01-15 17:24:00 +01:00
Laurent Rineau c35c608021 Merge pull request #4370 from maxGimeno/Demo-Improve_3mf_detection-maxGimeno
Add PATHS to find_path 3mf
2020-01-15 17:23:55 +01:00
Simon Giraudot 9c81fcc61e Update CHANGES.md 2020-01-15 14:26:12 +01:00
Simon Giraudot 5beaa0c164 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-01-15 10:28:10 +01:00
Michel Zou 3b8d77aa8a version.h: workaround for SWIG parsing 2020-01-14 10:01:00 +01:00
Maxime Gimeno 283c4e67a5 Add CHANGES.md 2020-01-13 14:44:35 +01:00
Laurent Rineau eb9b8e6c52 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-01-10 15:28:14 +01:00
Laurent Rineau 0019db6076 Fix a bug introduced in CGAL-5.0
When CGAL is configured in non-header-only, and then installed, then
CGAL_Qt5 does not work, with a CMake error. Reported in StackOverflow:

  https://stackoverflow.com/q/59596301/1728537
2020-01-10 12:34:58 +01:00
Laurent Rineau 8dec83dcf1
Update Installation/cmake/modules/FindOpenMesh.cmake
Fix my previous commit.
2020-01-08 09:55:22 +01:00
Maxime Gimeno 2be81f7965 Add a name in FindGLPK.cmake 2019-12-30 16:41:01 +01:00
Guillaume Damiand 0b7ec2e216 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-20 10:02:23 +01:00
Sébastien Loriot fa0ffeaaed update CHANGES 2019-12-20 09:36:39 +01:00
Sébastien Loriot 15c14c0357 update CHANGES 2019-12-20 09:30:45 +01:00
Sébastien Loriot c328c66299 update CHANGES 2019-12-20 09:26:23 +01:00
Sébastien Loriot 87d2d83703 Merge remote-tracking branch 'cgal/master' 2019-12-20 09:24:41 +01:00
Maxime Gimeno 4c36c04fd6 Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno 2019-12-19 11:26:55 +01:00
Laurent Rineau 03ea31e562 Better FindOpenMesh.cmake, compatible with the upcoming OpenMesh 8.1 2019-12-17 16:03:54 +01:00
Laurent Rineau 3ec3e4e9d4 Fix FindOpenMesh.cmake
```
CMake Error at C:/CGAL/test/CGAL-5.1-Ic-33/cmake/modules/FindOpenMesh.cmake:54 (set_target_properties):
  Property INTERFACE_LINK_LIBRARIES may not contain link-type keyword
  "optimized".  The INTERFACE_LINK_LIBRARIES property may contain
  configuration-sensitive generator-expressions which may be used to specify
  per-configuration rules.
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.1-Ic-33/BGL/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Release-64bits.gz
2019-12-17 15:17:07 +01:00
Maxime Gimeno c7c35c24f7 Remove remaining WITH_GMPXX in list 2019-12-16 09:37:52 +01:00
Maxime Gimeno 0783723f47 restore wrongly deleted lines 2019-12-16 09:30:54 +01:00
Maxime Gimeno 64bce3fd90 Remove tehe option WITH_GMPXX completely 2019-12-13 16:31:34 +01:00
Laurent Rineau e628e6e203 This branch target 4.14.3 2019-12-12 10:50:20 +01:00
Mael Rouxel-Labbé 844cd55f85 Add license files 2019-12-09 15:43:30 +01:00
Laurent Rineau 3a963288ef Merge remote-tracking branch 'cgal/master' into Installation-fix_check_of_documented_headers__for_5.1-GF 2019-12-09 15:23:22 +01:00
Laurent Rineau 8db15111a4 Merge branch 'releases/CGAL-5.0-branch' into Installation-fix_check_of_documented_headers-GF 2019-12-09 15:08:33 +01:00
Laurent Rineau 9149d26492 Fix check headers
Before this commit, headers with their own documentation pages, but
not referenced in other documentation pages, were not considered as
documented. This is a fix.
2019-12-09 15:07:10 +01:00
Guillaume Damiand 535fff1199 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-05 18:21:41 +01:00
Mael 7db5153f6d
Merge branch 'master' into PMP-Remove_small_CCs 2019-12-05 12:19:31 +01:00
Laurent Rineau 7aa90a3266 Fix CHANGES.md 2019-12-05 11:10:12 +01:00
Laurent Rineau d19f79ee0d Merge pull request #4163 from MaelRL/T2-Throw_on_collinear_strongly_intersecting_segments-GF
CDT2: Throw on constraint intersections that do not require constructions
2019-12-05 11:05:47 +01:00
Laurent Rineau 80ef3b832c Merge pull request #4175 from MaelRL/PMP-Stitch_borders_returns_number_of_stitched_pairs-GF
PMP: stitch borders returns number of stitched pairs
2019-12-05 11:05:44 +01:00
Laurent Rineau 0fa0c4fbb9 Merge pull request #4244 from maxGimeno/AABB_tree-Make_accelerate_distance_queries_default-maxGimeno
AABB_tree: make accelerate distance queries default
2019-12-05 11:05:35 +01:00
Laurent Rineau 0ea4cf4054 Merge branch 'releases/CGAL-5.0-branch' 2019-12-05 11:04:14 +01:00
Laurent Rineau f67b017463 Merge pull request #4347 from sloriot/CGAL-license_issues
Fix license issues
2019-12-05 11:01:11 +01:00
Laurent Rineau 65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2019-12-03 19:18:15 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Mael Rouxel-Labbé 020aa0a404 Update CHANGES.md 2019-12-02 16:31:35 +01:00
Mael f01f25234b
Merge branch 'master' into PMP-Stitch_borders_returns_number_of_stitched_pairs-GF 2019-12-02 16:25:43 +01:00
Mael Rouxel-Labbé cb813a5b49 Update CHANGES.md 2019-12-02 16:24:41 +01:00
Simon Giraudot dd43f1c262 Clean CHANGES.md 2019-12-02 16:10:28 +01:00
Guillaume Damiand 90457b38c7 Update licences 2019-11-26 14:21:39 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Laurent Rineau abd7f5a099 Mext release in this branch will be 5.0.1 2019-11-08 20:57:39 +01:00
Laurent Rineau 68ca489924 Next release on master will be 5.1-dev 2019-11-08 18:13:44 +01:00
Laurent Rineau 27dcff6141 Prepare CGAL-5.0 finale version 2019-11-08 10:58:29 +01:00
Sébastien Loriot 585bb8c7d6 fix license issues 2019-11-07 06:22:28 +01:00
Laurent Rineau e10ace6bcf Merge pull request #4334 from sloriot/CGAL-SPDX_cleanup_fixes
Fix some remaining license notice + add a missing LicenseRef-Commercial
2019-11-06 17:45:23 +01:00
Sébastien Loriot bff5db68e1 fix some remaining license notice + add a missing LicenseRef-Commercial 2019-10-31 14:17:20 +01:00
Laurent Rineau bc735b44a0 Check the presence of <CGAL/Qt/*.h> header
When CGAL is installed by package-managers, CGAL_Qt5 headers maybe
installed separately:
  - `libcgal-qt5-dev` on Debian,
  - `CGAL-qt5-devel` on Fedora, for example.
2019-10-31 13:49:22 +01:00
Laurent Rineau 387f55cfca Next version in this branch will be 5.0-beta3 (or the final release) 2019-10-31 10:32:50 +01:00
Laurent Rineau 57152023c2 Merge pull request #4304 from MaelRL/CGAL-Header_only_doc_rewrite-GF
Documentation: switch manual to header-only by default (+misc improvements)
2019-10-29 15:23:39 +01:00
Laurent Rineau d24671eacf Announce the changes to the documentation 2019-10-29 15:04:55 +01:00
Laurent Rineau 9ae69bc85a Bump the Boost version number (and release month) 2019-10-29 15:02:01 +01:00
Mael ab65cc9800
Merge branch 'master' into PMP-Remove_small_CCs 2019-10-28 09:07:45 +01:00
Simon Giraudot c43c6ac2fa Merge remote-tracking branch 'clement/Faster_dd_spatial_searching-cjamin' into Faster_dd_spatial_searching-cjamin 2019-10-22 13:21:53 +02:00
Sébastien Loriot 0228f1e4ee update SPDX tag to use the original customer license
The license notice in the headers are not in the original headers
2019-10-20 10:43:11 +02:00
Sébastien Loriot 7c63219861 Manual removal of license notice + SPDX updates 2019-10-19 17:14:18 +02:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Mael Rouxel-Labbé defeee0d86 Merge branch 'CGAL-Header_only_doc_rewrite-GF-old' into CGAL-Header_only_doc_rewrite-GF 2019-10-19 13:06:45 +02:00
Sébastien Loriot 4788398628 add notice for commercial license 2019-10-19 12:23:05 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot d0f23b56f6 update deprecated SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0$" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0$/SPDX-License-Identifier: GPL-3.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0$/SPDX-License-Identifier: LGPL-3.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0$/SPDX-License-Identifier: LGPL-2.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.1$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.1$/SPDX-License-Identifier: LGPL-2.1-only/"
2019-10-18 22:08:05 +02:00
Sébastien Loriot 1c829dcb08 remove extra space 2019-10-18 22:04:37 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Laurent Rineau be0c21cfa4 Merge pull request #4280 from lrineau/CGAL-fix_CGAL_CreateSingleSourceCGALProgram-GF
Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others components
2019-10-18 14:17:15 +02:00
Laurent Rineau 95fecfc784 Merge pull request #4285 from lrineau/Installation-fix_CMake_scripts_for_installed_header_only-GF
Fix CMake scripts for installed header-only version of CGAL
2019-10-18 14:17:08 +02:00
Sébastien Loriot bbfb23181e pass on the doc 2019-10-17 15:02:47 +02:00
Laurent Rineau 5ad86b83c6 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF
Do not require -DCGAL_HEADER_ONLY
2019-10-16 18:04:33 +02:00
Laurent Rineau ac1b7ec61a Fix CGAL_Qt5 in non-header-only 2019-10-16 18:02:26 +02:00
Laurent Rineau 2caae76bc5 Merge pull request #4262 from MaelRL/PMP-Fix_missing_images_and_history-GF
PMP (and changelog): Fix misc errors in 5.0-beta1
2019-10-15 16:34:11 +02:00
Laurent Rineau 47fcaf3d47 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF
Do not require -DCGAL_HEADER_ONLY
2019-10-15 16:34:09 +02:00
Laurent Rineau e496a5e679 Merge pull request #4280 from lrineau/CGAL-fix_CGAL_CreateSingleSourceCGALProgram-GF
Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others components

# Conflicts:
#	Scripts/scripts/cgal_create_CMakeLists
2019-10-15 16:33:17 +02:00
Laurent Rineau 119055d688 Merge pull request #4281 from sloriot/CGAL-default_endian
Add a way to define a default endianness
2019-10-15 16:31:39 +02:00
Laurent Rineau e6510c7b5c Merge pull request #4285 from lrineau/Installation-fix_CMake_scripts_for_installed_header_only-GF
Fix CMake scripts for installed header-only version of CGAL
2019-10-15 16:31:30 +02:00
Laurent Rineau b6a935c3cf Merge pull request #4292 from maxGimeno/CGAL_Config-Fix_typo-maxGimeno
Remove extra S in macro
2019-10-15 16:31:24 +02:00
Laurent Rineau 13bd01d38c Fix when CGAL_Qt5 is not available 2019-10-15 09:16:26 +02:00
Maxime Gimeno 856b7722f1 Remove extra S in macro 2019-10-15 09:03:13 +02:00