songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
87,290 Commits 3 Branches 156 Tags 974 MiB
Commit Graph

3603 Commits

Author SHA1 Message Date
Laurent Rineau 9efbeb3f3b Header-only: remove -isystem in the testsuite or dev-mode 2019-08-14 13:50:19 +02:00
Laurent Rineau a0ea4f0c5f Merge branch 'releases/CGAL-4.14-branch' 2019-07-31 17:01:03 +02:00
Maxime Gimeno 69e5072cc1 Get rid of the two fake lines in ctest_testsuite 2019-07-29 13:35:19 +02:00
Laurent Rineau 7b1889b87e Merge branch 'releases/CGAL-4.14-branch' 
# Conflicts:
#	Point_set_processing_3/include/CGAL/IO/write_ply_points.h
 2019-07-26 18:45:17 +02:00
Laurent Rineau da2726e0e7 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 
# Conflicts:
#	CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Intersections_2/test/Intersections_2/test_intersections_2.cpp
#	Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h
#	Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h
 2019-07-26 18:33:55 +02:00
Laurent Rineau 4d5b4c950a Merge pull request #4085 from maxGimeno/Update_Find_TBB-GF 
Update FindTBB.cmake
 2019-07-26 18:27:00 +02:00
Laurent Rineau 5d47146cd6 Fix in header-only 2019-07-25 16:14:50 +02:00
Laurent Rineau fbf163d244 Fix when CGAL_USE_FILE is not included 2019-07-25 16:13:08 +02:00
Laurent Rineau a17c0d628d Fix our usage of TBB and <thread.h> 
A lot of parts of CGAL use `<thread>` in conjunction with TBB. I have
added the `find_package(Threads)` in `CGAL_target_use_TBB.cmake` for
convenience.

I have also restored FindTBB.cmake as a pure copy of
  https://github.com/Kitware/VTK/blob/master/CMake/FindTBB.cmake
with that version:

> c7249fed2e73ce25fbbc53363d9caf4ab5cc9195
> Author: Cory Quammen <cory.quammen@kitware.com>
> Date:   Thu Feb 14 23:21:09 2019 -0500
>
>     FindTBB: handle basic linker scripts
>
>     TBB binaries may define libtbb.so as a linker script of the form
>
>     INPUT(libtbb.so.2)
>
>     Make FindTBB find the real .so file libtbb.so points to in such cases.
>
>     Approach borrowed from vtk-m/CMake/VTKmDeviceAdapters.cmake on
>     suggestion from Robert Maynard.
>
>
 2019-07-24 10:35:36 +02:00
Sebastien Loriot 0dd30b1a68
Merge pull request #3900 from lrineau/CGAL-header_only_by_default-GF 
Make CGAL_HEADER_ONLY the default in CGAL-5.0
 2019-07-19 21:14:34 +02:00
Maxime Gimeno 82567685ad Add include of CGAL_taret_use_TBB in the end of the new FindTBB 2019-07-19 09:34:12 +02:00
Sébastien Loriot 724e70b97f Merge pull request #3984 from LiangliangNan/master 
New package 'Polygonal Surface Reconstruction' and an extension of 'Solver Interface'
 2019-07-18 17:05:25 +02:00
Sébastien Loriot c411ae69d0 Merge pull request #2951 from kkatrio/PMP-smoothing-kkatrio 
PMP: Mesh and shape smoothing
 2019-07-18 16:49:05 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF 
PMP: Add locate.h and rewrite Triangulation_2 graph traits
 2019-07-18 16:40:49 +02:00
Sebastien Loriot 8adc64dfe3
Merge pull request #3860 from MaelRL/PMP-Add_non_manifold_vertices_collector-GF 
PMP: Add function 'non_manifold_vertices'
 2019-07-18 16:38:15 +02:00
Mael Rouxel-Labbé 047cfeb1fa Add namespace in CHANGES.md 2019-07-18 16:37:29 +02:00
Mael Rouxel-Labbé 18617dcf39 Modify changes.md 2019-07-18 16:28:56 +02:00
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets 
match @{ and @}
 2019-07-18 16:26:43 +02:00
Maxime Gimeno 7f604308d0 Update FindTBB.cmake 2019-07-15 12:45:28 +02:00
Laurent Rineau 58e12565e3 Prepare release candidates for 5.0-beta1 2019-07-12 15:31:07 +02:00
Sébastien Loriot 4312b05ec1 fix function name 2019-07-12 06:26:40 +02:00
Mael 47c247ae72
Merge branch 'master' into PMP-smoothing-kkatrio 2019-07-10 15:36:25 +02:00
Laurent Rineau d3b9d89596 Merge pull request #4013 from lrineau/CGAL_Core-no_need_for_Boost.Thread-GF 
Remove the need for Boost.Thread (but for CGAL_Core and gcc<9.1)
 2019-07-10 14:22:53 +02:00
Laurent Rineau dc02598a5c Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand 
CGAL: more viewers
 2019-07-10 14:22:50 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau e79bfd5d03 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-03 11:10:03 +02:00
Maxime Gimeno 7155df2743 Merge remote-tracking branch 'cgal/master' into liangliang_master 2019-07-01 14:59:24 +02:00
Laurent Rineau 6639a69869
Merge pull request #4047 from sgiraudot/PSP-Spherical_queries-Update_changes-GF 
Update CHANGES.md for PSP: Spherical Neighborhood Queries
 2019-07-01 12:18:58 +02:00
Simon Giraudot f46751e487 Update CHANGES.md 2019-07-01 12:02:08 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Mael f40f8e4190
Merge branch 'master' into PMP-smoothing-kkatrio 2019-07-01 11:24:11 +02:00
Laurent Rineau 44e4d1526c Fix the CHANGES.md 2019-07-01 11:22:46 +02:00
Laurent Rineau 39a245220a Merge pull request #3660 from mglisse/NewKernel_d-lazy_Epeck_d-glisse 
Epeck_d
 2019-07-01 11:16:33 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF 
CMake>=3.13: opt for for new policies up to 3.15
 2019-07-01 11:16:30 +02:00
Laurent Rineau dbb1cb6c9b Merge pull request #3974 from afabri/Triangulation-add_ranges-GF 
Triangulation_{2,3):  Add ranges
 2019-07-01 11:16:05 +02:00
Mael Rouxel-Labbé 6a83f908e7 Align CHANGES.md with master 2019-06-28 17:43:09 +02:00
Laurent Rineau 5341998c7e Add a new ctest fixture, that checks the build system 
That will avoid that `cmake` is run in parallel several times, when
`ctest -j` is used.
 2019-06-28 12:53:53 +02:00
Mael Rouxel-Labbé 2729098c29 Update CHANGES.md 2019-06-26 08:42:23 +02:00
Liangliang Nan 655fa4b30d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-25 14:23:17 +02:00
Laurent Rineau 2ce7800239 Unfortunately gcc < 9.1 has bug with thread_local that impact CGAL 2019-06-24 14:27:20 +02:00
Mael Rouxel-Labbé 7c82c96dfd Proper usage of CMake to find and use Ceres 
done with the help of @lrineau
 2019-06-21 11:24:32 +02:00
Mael Rouxel-Labbé 0d1759e996 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-06-20 15:02:32 +02:00
Mael Rouxel-Labbé 7a5486962d Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-20 14:49:25 +02:00
Laurent Rineau 17add8332e Merge pull request #3903 from MaelRL/PMP-Generalize_keep_largest_CC-GF 
PMP: Generalize `keep_large(st)_CCs`
 2019-06-20 14:21:14 +02:00
Laurent Rineau 8fd3f2d8fd Merge pull request #3973 from sgiraudot/Kernel_23-Add_hash_functions-GF 
[Small Feature] Add hash functions for kernel objects
 2019-06-20 14:21:09 +02:00
Mael Rouxel-Labbé cad9a0aaa8 Make things work when Ceres is not available 2019-06-20 13:04:15 +02:00
Laurent Rineau 1bcaf6bbf3 Fix in non-header-only: one has to call find_package(Boost) 2019-06-20 11:57:37 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +02:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00