Commit Graph

4032 Commits

Author SHA1 Message Date
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
Laurent Rineau 27d585438b Support non-header-only 2020-10-27 09:16: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
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 335ac3d5dd Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-10-20 13:32:03 +02:00
Simon Giraudot d060301664 Update CHANGES.md 2020-10-19 08:06:23 +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
Vishal Pratap Singh aa9c627b4d Defined CXX20 2020-10-08 13:47:59 +05:30
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
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
Maxime Gimeno bf883db721 Fix uninitialized warning in test_use_h 2020-09-22 15:30:28 +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