Commit Graph

4234 Commits

Author SHA1 Message Date
Laurent Rineau 7b508d6385 Next release on this branch will be 5.2.1 2020-12-22 16:16:05 +01:00
Laurent Rineau f79fbb34d3 This branch now targets 5.1.3 2020-12-22 11:55:08 +01:00
Laurent Rineau 485e672c26 Prepare for 5.2 final version 2020-12-18 15:58:54 +01:00
Maxime Gimeno 1d98f0f71d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-12-09 14:40:02 +01:00
Sebastien Loriot 48a1273546
Update Installation/CHANGES.md
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2020-12-08 09:36:55 +01:00
Sébastien Loriot 7b8f5ce7ed update changes 2020-12-07 16:49:49 +01:00
Sébastien Loriot 08eeacca8b Merge remote-tracking branch 'cgal/master' into FastEnvelope-GF 2020-12-07 16:40:34 +01:00
Laurent Rineau 7506e5da16 Prepare CHANGES.md for 5.3 2020-12-07 16:35:24 +01:00
Laurent Rineau ffc56a3251 Merge pull request #5139 from MaelRL/CGAL-Improve_license_doc-GF
Installation: Doc and license-less license clarifications
2020-12-04 17:16:13 +01:00
Maxime Gimeno 6f50502b3e Re-add Creative Commons 2020-12-03 10:32:55 +01:00
Maxime Gimeno 334d49b1e7 Use CC0 instead of full name 2020-12-03 10:14:29 +01:00
Maxime Gimeno 83c9a00d73 Fix Conflict 2020-12-03 09:44:03 +01:00
Maxime Gimeno a6dab0379c Fix text in LICENSE and LICENSE.md 2020-12-03 09:43:14 +01:00
Maxime Gimeno b477021ad1 Remove LICENSE.FREE_USE from installation tests 2020-12-03 09:12:08 +01:00
Andreas Fabri 2d4ff0a9ac Replace LICENSE.FREE_USE by CC0 2020-11-26 13:33:14 +00:00
Laurent Rineau 58af499996 master now targets CGAL-5.3-dev 2020-11-20 21:34:18 +01:00
Laurent Rineau a60a9e638d Next release will be 5.2-beta2 2020-11-18 20:30:18 +01:00
Mael Rouxel-Labbé d6f06b9f14 Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-11-17 10:24:16 +01:00
Laurent Rineau a8f143d6a8 This branch now targets 5.1.2 2020-11-16 19:39:23 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Laurent Rineau 3e31a74859
Merge pull request #5159 from MaelRL/CGAL-Prepare_changes.md-5.2-GF 2020-11-16 14:44:16 +01:00
Laurent Rineau 048b29d671 Fix links 2020-11-16 09:08:54 +01:00
Mael Rouxel-Labbé c9db053fa8 Prepare CHANGES.md for 5.2 2020-11-13 17:27:22 +01:00
Andreas Fabri f246c4abf8 merge 2020-11-13 16:26:57 +00:00
Laurent Rineau 1d9bebc673 Prepare CGAL-5.2-beta1 2020-11-13 16:37:15 +01:00
Laurent Rineau 49e7ddccc9 Merge pull request #4243 from maxGimeno/Cmake_improvements-maxGimeno
General CMake improvements
2020-11-13 15:43:54 +01:00
Laurent Rineau 2f73dab22f Merge pull request #5071 from sgiraudot/PSP-Scanline_orient_normals-GF
[Small Feature] Scanline Orient Normals
2020-11-13 15:31:56 +01:00
Andreas Fabri 6b9bd51fcb Rename license file 2020-11-12 14:45:14 +00:00
Maxime Gimeno 8e23d5c482 Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-11-10 09:00:41 +01:00
Laurent Rineau 3d6d9f541f Fix merge issues (not visible as Git conflicts) 2020-11-10 08:51:31 +01:00
Laurent Rineau d0dd5a93bf Merge pull request #4639 from janetournois/Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF
Small feature - Triangulation Segment Cell/Simplex Iterator
2020-11-10 08:45:38 +01:00
Simon Giraudot d998347f91 Move section in CHANGES.md to the correct release 2020-11-10 08:25:48 +01:00
Simon Giraudot 6236370402
Update Installation/CHANGES.md
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2020-11-09 14:31:42 +01:00
Simon Giraudot e6c23195ed Update CHANGES.md 2020-11-09 08:36:38 +01:00
Maxime Gimeno cc00d293df Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-11-06 09:37:18 +01:00
Ahmed Essam bb17d4909f
Merge branch 'master' into AABBTreeC++11 2020-10-29 23:04:48 +00:00
Maxime Gimeno 1c00bf6847 Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-29 15:09:16 +01:00
Laurent Rineau a6c5402dc6
Merge pull request #4885 from MaelRL/Iterative_authalic_parameterization 2020-10-29 14:21:42 +01:00
Laurent Rineau 5d7c6e55c3 Merge pull request #5047 from sloriot/SM-do_not_clear_properties
Add a way to not remove properties after clearing the mesh
2020-10-29 10:53:05 +01:00
Mael 38c3dc7924 Merge branch 'master' into Iterative_authalic_parameterization 2020-10-28 17:34:01 +01:00
Mael a6d1023301 Update CHANGES.md 2020-10-28 17:32:14 +01:00
Laurent Rineau 41211e308b Merge branch '5.1.x-branch' 2020-10-28 09:52:34 +01:00
Laurent Rineau 6007fe7c04 Merge branch 'releases/CGAL-5.0-branch' into 5.1.x-branch 2020-10-28 09:51:02 +01:00
Maxime Gimeno aa26d7a58b Fix merging error 2020-10-28 08:45:29 +01:00
Laurent Rineau 27d585438b Support non-header-only 2020-10-27 09:16:53 +01:00
Maxime Gimeno 2ad4c16b6e Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-26 15:00:53 +01:00
Laurent Rineau 14f27a2b41 Fix CTest issues with CGAL_Qt5
Add a target `compilation_of__CGAL_Qt5_moc_and_resources`, and a
corresponding CTest test, so that `CGAL_Qt5_moc_and_resources` is
always compiled first, when needed. That will fix CTest
race-conditions, where `CGAL_Qt5_moc_and_resources` was being compiled
by several CTest test at the same time.
2020-10-26 13:52:33 +01:00
Simon Giraudot 066712c881 Use Orthtree everywhere + define Octree/Quadtree aliases 2020-10-22 13:00:34 +02:00
Sebastien Loriot da0d6fda44
Merge branch 'master' into Classification-Simpler_IO_for_ETHZ_Random_forest-GF 2020-10-21 08:28:55 +02:00
Sébastien Loriot 5a6333f014 Merge remote-tracking branch 'cgal/master' 2020-10-20 13:42:46 +02:00
Sébastien Loriot 335ac3d5dd Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-10-20 13:32:03 +02:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Sébastien Loriot 87b8f66e14 update from master 2020-10-20 09:19:13 +02:00
Andreas Fabri d2db2ac531 Put Envelope code in a header file in PMP 2020-10-20 09:17:16 +02:00
Jane Tournois 2bf4da4edc Merge branch 'master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF
# Conflicts:
#	Installation/CHANGES.md
2020-10-19 16:27:04 +02:00
Mael Rouxel-Labbé e3c08cf7dc Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-10-19 16:17:27 +02:00
Simon Giraudot d060301664 Update CHANGES.md 2020-10-19 08:06:23 +02:00
Laurent Rineau 9e96a45e55
Merge branch 'master' into AABBTreeC++11 2020-10-16 19:01:59 +02:00
Laurent Rineau 216d066285 Merge remote-tracking branch 'cgal/master' into Surface_mesh_reuse_garbage-GF 2020-10-16 14:01:58 +02:00
Laurent Rineau b4a536047d
Merge pull request #5060 from Vishal19111999/CGAL-Define_CXX20_master-Vishal19111999 2020-10-16 13:56:25 +02:00
Maxime Gimeno 9f74598459 Fix tests find_package 2020-10-16 10:37:26 +02:00
Maxime Gimeno 7bdc5d11a9 Post-review 2020-10-15 15:03:20 +02:00
Sebastien Loriot 1aab0c626a
Update Installation/CHANGES.md
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2020-10-15 11:06:39 +02:00
Sébastien Loriot a5c8bebb09 update CHANGES 2020-10-14 18:07:44 +02:00
Maxime Gimeno 1df239ed11 restore WITH_cgal_lib as it is use din some tests and examples. 2020-10-14 11:57:43 +02:00
Maxime Gimeno 107c4350d0 remove all /src directories 2020-10-14 11:22:49 +02:00
Maxime Gimeno 0c14520987 Fix CGAL_Qt5 installation 2020-10-14 11:14:58 +02:00
Maxime Gimeno fcb6419106 WIP CGAL_qt5 2020-10-13 15:36:44 +02:00
Maxime Gimeno 27ddd9bf86 remove flags in CI 2020-10-12 15:44:44 +02:00
Maxime Gimeno 2ed89ef35e simplify CGAL_setup dependencies. 2020-10-12 12:24:13 +02:00
Maxime Gimeno 0f46df37df Restore GLOB 2020-10-12 11:11:04 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Maxime Gimeno 9883437315 revert the GLOB rework 2020-10-09 15:59:27 +02:00
Maxime Gimeno 3aa2f81ad9 test travis. 2020-10-09 15:08:09 +02:00
Maxime Gimeno 9a90628fa5 Fix header check 2020-10-09 14:29:40 +02:00
Maxime Gimeno fb39fc71ac Revert most changes to the cgal_use_file 2020-10-09 12:55:25 +02:00
Maxime Gimeno af5d1ee535 fix list 2020-10-09 11:16:23 +02:00
Maxime Gimeno fe75ee4ee6 restore CMP0077 2020-10-08 13:42:42 +02:00
Maxime Gimeno 221bbdd4b1 remove CMP code now that we only support from cmake 3.13 2020-10-08 12:31:41 +02:00
Maxime Gimeno 733c487cc2 Fix file(GLOB...) in Installation/CMakeLists 2020-10-08 11:01:18 +02:00
Vishal Pratap Singh aa9c627b4d Defined CXX20 2020-10-08 13:47:59 +05:30
Maxime Gimeno 616574e5ab Modernize CMake scripts 2020-10-06 15:44:41 +02:00
Maxime Gimeno 39f97ca56b remove NOT CGAL_HEADER_ONLY 2020-10-05 15:44:05 +02:00
Maxime Gimeno fa2e8ec0a4 remove WITH_XXX cache options 2020-10-05 15:19:55 +02:00
Maxime Gimeno 27589e4b26 Remove preconfigured 3rd party libs options 2020-10-05 14:37:38 +02:00
Efi Fogel ee62fa60ed Improved documentation of the Boolean_set_operations_2 free functions 2020-10-03 10:21:13 +03:00
Mael 0cc1f01f82
Merge branch 'master' into PMP-Local_stitch_borders-GF 2020-10-02 15:39:05 +02:00
Sebastien Loriot 47d2189f8e
Merge pull request #3268 from afabri/PMP-visitor-GF
PMP::triangulate_faces() Add a visitor that allows to map each triangle to its original face
2020-10-02 15:26:05 +02:00
Sébastien Loriot 4e0fc267af Merge pull request #4715 from afabri/BGL-test_face-GF
BGL: Add a function to check if add_face() can be called successfully
2020-10-02 15:24:45 +02:00
Sebastien Loriot af260a3156
Merge pull request #4869 from maxGimeno/CGAL-CMake_testsuite-maxGimeno
Add a testsuite for CMake
2020-10-02 15:21:47 +02:00
Sebastien Loriot 9e4970faef
Merge pull request #4781 from lrineau/Mesh_3-ITT_support-GF
Add ITT support in Mesh_3
2020-10-02 15:20:04 +02:00
Sebastien Loriot 03ff1a667f
Merge pull request #4784 from efifogel/Aos_2-remove_object-efif
Aos_2: Change Make_x_monotone_2 return type from legacy CGAL::Object to boost::variant
2020-10-02 15:19:36 +02:00
Sebastien Loriot 9ce3e3a3c1
Merge pull request #5024 from janetournois/Installation-remove_msvc_bug_macro-GF
Installation - matching bug is fixed in MSVC >= 2015
2020-10-02 15:13:15 +02:00
Maxime Gimeno 1be84a948f Copy resource files when building the demo from installation 2020-09-30 12:03:05 +02:00
Efi Fogel df96ed73d4 Merge remote-tracking branch 'cgal/master' into Aos_2-remove_object-efif 2020-09-29 19:04:35 +03:00
Jane Tournois 57250ce637 Merge remote-tracking branch 'cgal/master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF
# Conflicts:
#	Installation/CHANGES.md
2020-09-28 16:01:05 +02:00
Laurent Rineau afc0abb82f Oops, fix conflicts markers 2020-09-28 14:50:31 +02:00
Jane Tournois d07a5f2911 remove MSVC_compiler_config.h which is not needed anymore 2020-09-25 14:41:06 +02:00
Jane Tournois 5c8df6672a remove CGAL_CFG_MATCHING_BUG_ variants
the "matching bug" of msvc has been fixed since at least vs 2015
2020-09-25 14:25:14 +02:00
Laurent Rineau 8d947b0b59 Merge pull request #4838 from mglisse/doc-power-d
Document Power_center_d, Power_distance_d (renamed)

# Conflicts:
#	Installation/CHANGES.md
2020-09-24 16:43:40 +02:00
Laurent Rineau ac1681fc2e Merge pull request #4984 from sloriot/CGAL-small_post_release_fixes
Tiny post release fixes

# Conflicts:
#	Installation/CHANGES.md
2020-09-24 16:42:54 +02:00
Laurent Rineau d1503c21b9 Merge pull request #4984 from sloriot/CGAL-small_post_release_fixes
Tiny post release fixes
2020-09-24 16:36:55 +02:00
Maxime Gimeno 164f1bf790 Fix path length warnings on windows 2020-09-23 11:07:34 +02:00
Sébastien Loriot 7938060fd0 Merge 'cgal/master' 2020-09-22 15:47:26 +02:00
Maxime Gimeno bf883db721 Fix uninitialized warning in test_use_h 2020-09-22 15:30:28 +02:00
Mael Rouxel-Labbé db1823a470 Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-09-22 14:27:09 +02:00
Mael Rouxel-Labbé 4bce5cfcd2 Add Tos2 to the various package lists + license 2020-09-22 14:13:16 +02:00
Mael Rouxel-Labbé 0ad161c61d Merge branch 'Triangulation_on_sphere_2-GF-old' 2020-09-22 14:10:03 +02:00
Mael Rouxel-Labbé 406488c86a Add some package structure (package info, license, cmakelists) 2020-09-22 14:01:54 +02:00
Mael Rouxel-Labbé 4694a48913 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-09-22 11:35:25 +02:00
Mael Rouxel-Labbé e189791871 Update CHANGES.md 2020-09-22 11:00:20 +02:00
Laurent Rineau bc4041fccd
Merge branch 'master' into Aos_2-remove_object-efif 2020-09-18 13:27:08 +02:00
Laurent Rineau 5e532d9cf3
Merge branch 'master' into PMP-visitor-GF 2020-09-18 13:26:45 +02:00
Laurent Rineau cd7907194f
Update CHANGES.md 2020-09-18 13:25:07 +02:00
Sébastien Loriot 28968dfa11 update changes 2020-09-18 13:23:11 +02:00
Laurent Rineau 29db90f89f Fix CMake warnings
Reduce the path of the build directories used during the tests.

That will remove those CMake warnings:
```
22: CMake Warning in demo/Linear_cell_complex/CMakeLists.txt:
22:   The object file directory
22:
22:     C:/CGAL/test/CGAL-5.2-Ic-6/cmake/platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits/test/Installation/build_dir/non_standard_build/demo/Linear_cell_complex/CMakeFiles/Linear_cell_complex_3_demo.dir/
22:
22:   has 202 characters.  The maximum full path to an object file is 250
22:   characters (see CMAKE_OBJECT_PATH_MAX).  Object file
22:
22:     Linear_cell_complex_3_demo_autogen/mocs_compilation.cpp.obj
22:
22:   cannot be safely placed under this directory.  The build may not work
22:   correctly.
22:
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.2-Ic-6/Installation/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Release-64bits.gz
2020-09-17 09:55:35 +02:00
Efi Fogel 4389ea7cca Fixed the previous merge 2020-09-16 12:39:10 +03:00
Efi Fogel b41988aa70 Merge remote-tracking branch 'cgal/master' into Aos_2-remove_object-efif 2020-09-15 17:18:34 +03:00
Laurent Rineau fc40738343
Merge branch 'master' into PMP-visitor-GF 2020-09-15 12:42:47 +02:00
Jane Tournois adb1b560b1 edit CHANGES.md 2020-09-15 12:22:12 +02:00
Marc Glisse 8fc2d82083 CHANGES.md
(I rebased the branch at the same time)
2020-09-11 15:44:31 +02:00
Laurent Rineau f4a1868cfe Merge pull request #4731 from sloriot/CH3-dual_interior_point
Document internal function for computing interior point

# Conflicts:
#	Installation/CHANGES.md
2020-09-11 15:24:32 +02:00
Laurent Rineau fac1f85985 Merge pull request #4938 from sloriot/BGL-simpler_inheritance
Add a convenience header file to inherit from face graphs
2020-09-11 15:16:34 +02:00
Sébastien Loriot c632bb4575 update changes 2020-09-11 15:14:52 +02:00
Sébastien Loriot 5755a9bbbd update changes 2020-09-11 15:11:15 +02:00
Laurent Rineau 113048faef Merge pull request #4960 from maxGimeno/Demo-C3t3_can_read_mesh_with_domain_0-maxGimeno
Polyhedron Demo: .mesh reading enhancement
2020-09-11 15:07:47 +02:00
Laurent Rineau 2539022143 This branch 5.1.x-branch targets CGAL 5.1.1 2020-09-10 13:44:22 +02:00
Laurent Rineau 6db27e5db6 Adapt doc and scripts to new tags and branchs names 2020-09-10 13:10:03 +02:00
Laurent Rineau 80168d85b2 Next release on master will be 5.2-dev 2020-09-08 16:44:17 +02:00
Maxime Gimeno aeda2ef58c Replace boolean name and prevent maxx_domain=0 2020-09-07 12:35:54 +02:00
Laurent Rineau b271ec54df Preparations for CGAL-5.1. 2020-09-04 15:18:51 +02:00
Maxime Gimeno ebdc2f352b Fix -C et -G 2020-08-27 14:31:30 +02:00
Maxime Gimeno 56af55ecd4 Fix bug in mesh_3 tests 2020-08-27 13:46:04 +02:00
Jackson Campolattaro b856dbdbfc Merge branch 'master' of github.com:CGAL/cgal into gsoc2020-Octree-campolattaro 2020-08-26 21:38:04 -04:00
Maxime Gimeno efba4d6651 Fixes for windows and result collection 2020-08-26 12:04:30 +02:00
Maxime Gimeno 25d0585b1f Propagate the INIT_FILE to the tests 2020-08-26 09:30:40 +02:00
Maxime Gimeno 1298289873 Add "cat error.txt" in the end of cgal_test_with_cgal so the errors are detected in the results and fix the grep for ***Failed 2020-08-25 09:49:06 +02:00
Mael Rouxel-Labbé 8682f9bafb Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-08-24 11:45:17 +02:00
Maxime Gimeno e2eca0150b Merge remote-tracking branch 'cgal/master' into CGAL-CMake_testsuite-maxGimeno 2020-08-21 14:40:58 +02:00
Sébastien Loriot 93d62b969c add forward declaration
File_medit.h is included by Mesh_complex_3_in_triangulation_3_base.h
2020-08-18 14:09:06 +02:00
Maxime Gimeno d558e7f259 Fix Warnings 2020-08-18 11:27:22 +02:00
Maxime Gimeno 7a91e29d3e Fixes 2020-08-07 09:07:58 +02:00
Maxime Gimeno 6ffb10a71c Fixes for cmake-testsuite...
- Use CGAL_RELEASE_DIR as CGAL_DIR to have the real setup
 - Use RUNNING_CGAL_AUTO_TEST to detect a testsuite setup
2020-08-06 11:03:53 +02:00
Maxime Gimeno 3f4c2cd127 Chmod +x the test script 2020-08-06 10:05:40 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Laurent Rineau 926610102f
Merge branch 'master' into gsoc2020-Surface_mesh_topology-Simplicity-johnmave126 2020-08-04 10:12:09 +02:00
Youmu e7b84948d5 Fix package name 2020-08-03 18:33:48 -04:00
Laurent Rineau 873fc83a44 This branch now targets 5.0.4 2020-08-03 12:25:09 +02:00
Youmu e3aee2fa3b Add description of changes 2020-07-31 15:59:34 -04:00
Laurent Rineau 1ae35c9f58 Document that we require Boost 1.66 or later
... and let's face that 5.1 will only be officially published in
September 2020, after the summer vacations.
2020-07-31 10:00:55 +02:00