Laurent Rineau
9c67734dcc
Push the `#define CGAL_HEADER_ONLY` at the top
2019-10-11 12:02:25 +02:00
Laurent Rineau
ff9eaa41f0
Fix CGAL_Qt5_FOUND and other
...
When an installed header-only version of CGAL is used, and when all
`demo/*` are configured at once, then only the first demo got
`CGAL_Qt5_FOUND` correctly set.
2019-10-11 11:01:24 +02:00
Laurent Rineau
08a42cf35b
Fix the detection of CGAL_ROOT
...
On Debian, CMake files are in
`/usr/local/lib/x86_64-linux-gnu/cmake/CGAL/` are our previous heuristic fails.
2019-10-11 11:00:29 +02:00
Laurent Rineau
e872e74654
Refactor the code
2019-10-10 17:59:46 +02:00
Sébastien Loriot
2f1ab3a86d
rename macro
2019-10-10 14:45:42 +02:00
Sébastien Loriot
66e3b216be
add a way to define a default endian
2019-10-10 13:00:33 +02:00
Laurent Rineau
ac557caa4a
Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others
2019-10-10 12:23:42 +02:00
Maxime Gimeno
5dd3c7ee83
Better test
2019-10-03 14:17:39 +02:00
Maxime Gimeno
60d3851a20
Set WITH_GMPXX ON if GMPXX is found in the cmake options of cgal
2019-10-03 13:35:35 +02:00
Laurent Rineau
030b4cf3a4
Whitelist more headers from Three
...
Without the uic-generated header, they cannot compile.
2019-10-02 11:31:45 +02:00
Laurent Rineau
779ef144fe
Do not require -DCGAL_HEADER_ONLY
...
Now, that macro is set unless `CGAL_NOT_HEADER_ONLY` is 1.
2019-10-01 18:10:30 +02:00
Laurent Rineau
f46c9888e6
Mention header-only by default in the changes as well
2019-10-01 14:06:47 +02:00
Mael Rouxel-Labbé
6cbea89a69
Update CHANGES.md
2019-10-01 13:21:38 +02:00
Laurent Rineau
1c814f5e6c
Changes proposed by Monique Teillaud
2019-10-01 11:01:04 +02:00
Mael Rouxel-Labbé
06360bc40b
Fix changelog for ComputeApproximateAngle_3 and associated models
2019-10-01 09:32:40 +02:00
Mael Rouxel-Labbé
b853219d12
Remove extra 'dihedral'
2019-10-01 09:15:31 +02:00
Maxime GIMENO
08696121e8
Update Installation/CHANGES.md
...
Co-Authored-By: Laurent Rineau <Laurent.Rineau@cgal.org>
2019-09-30 16:00:25 +02:00
Maxime Gimeno
546be7aff7
Add a `dry_run` parameter to `keep_large_connected_components()`
2019-09-30 15:49:36 +02:00
Laurent Rineau
44547d40ec
Next release in this branch will be 5.0-beta2
2019-09-30 15:25:45 +02:00
Laurent Rineau
5be38d3af0
Next release in this branch will be 4.14.2
2019-09-30 15:19:47 +02:00
Laurent Rineau
92e5b71e4d
New proposal for CHANGES.md
2019-09-30 12:04:26 +02:00
Laurent Rineau
e4cf45bf26
Let's be honest: the release will slip by a month
2019-09-30 09:47:29 +02:00
Laurent Rineau
e3cadd8be5
Reformat CHANGES.md
2019-09-30 09:45:20 +02:00
Laurent Rineau
1bce3f7909
Merge branch 'releases/CGAL-4.14-branch'
2019-09-27 16:25:29 +02:00
Laurent Rineau
0b66eb0d23
Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
...
# Conflicts:
# .travis/install.sh
2019-09-27 16:24:41 +02:00
Laurent Rineau
a28d1554b3
FindTBB.cmake: read both TBBROOT and TBB_ROOT ( #4252 )
...
FindTBB.cmake: read both TBBROOT and TBB_ROOT
2019-09-27 16:17:28 +02:00
Maxime Gimeno
2473456405
update auto-link.h
2019-09-27 16:06:12 +02:00
Maxime Gimeno
718421b2b9
Add a line in the Supported Compilers about MSVC and CMake
2019-09-27 15:55:25 +02:00
Maxime Gimeno
58b647a1c1
Fix CGAL_TOOLSET for latest visual compilers.
2019-09-27 14:48:53 +02:00
Laurent Rineau
7e36ab1848
FindTBB.cmake: read both TBBROOT and TBB_ROOT
...
Fix #4240
2019-09-26 15:52:20 +02:00
Maxime Gimeno
b1a8ec6d76
Add a way to upload a scene through ssh.
2019-09-26 14:57:22 +02:00
Maxime Gimeno
15d42d6cd2
Make the accelerate_distance_query() lazy and add a function to disable it.
2019-09-24 11:38:19 +02:00
Mael Rouxel-Labbé
6c9cd17d0f
Some more documentation updates
...
+ master merge
2019-09-23 15:44:31 +02:00
Laurent Rineau
df99307140
Merge branch 'releases/CGAL-4.14-branch'
2019-09-09 16:48:23 +02:00
Laurent Rineau
9abee11ee8
Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-09-09 16:43:29 +02:00
Laurent Rineau
2a5b7cd7ba
Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF
...
Fix CTest on windows
2019-09-05 14:59:38 +02:00
Laurent Rineau
dc93527270
Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF
...
Fix CTest on windows
2019-09-05 14:56:25 +02:00
Laurent Rineau
1ec8dc9db8
Remaining unregistered target
2019-09-04 14:19:54 +02:00
Laurent Rineau
94d654b9ab
Fill CGAL_EXECUTABLE_TARGETS wherever that was missing
2019-09-04 14:19:54 +02:00
Laurent Rineau
b8c7cb21bd
Add a hook to track targets without dependent
2019-09-04 14:18:12 +02:00
Laurent Rineau
f45c16f815
Add a new custom target ALL_CGAL_TARGETS to track all targets
...
That will include also targets with `EXCLUDE_FROM_ALL`.
2019-09-04 14:18:12 +02:00
Simon Giraudot
fff368c351
Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil
2019-09-02 09:46:54 +02:00
Laurent Rineau
5705b9da93
Fix CMake warnings (since 3.15)
2019-08-19 16:18:52 +02:00
Maxime Gimeno
ba9adf4aa9
Fix typo
2019-08-16 13:08:00 +02:00
Maxime Gimeno
3513016dcf
Updates for ctest with visual generator
2019-08-16 12:22:11 +02:00
Laurent Rineau
9efbeb3f3b
Header-only: remove -isystem in the testsuite or dev-mode
2019-08-14 13:50:19 +02:00
Necip Yildiran
e545f9ae5a
Improved doc for OpenGR/pointmatcher wrappers; edited Installation/CHANGES.md
2019-08-14 00:06:09 +03: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
Guillaume Damiand
7cd85f845b
Merge branch 'master' into Surface_mesh_topology-gdamiand
2019-07-10 15:32:21 +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
dee111bec5
Improve FindOpenMesh by adding an imported target
2019-07-05 10:35:56 +02:00
Simon Giraudot
b2e723b548
Merge branch 'Faster_dd_spatial_searching-cjamin-backup' into Faster_dd_spatial_searching-cjamin
2019-07-04 13:17:50 +02:00
Maxime Gimeno
f88d6111ce
update CHANGES.md
2019-07-04 11:38:10 +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
Guillaume Damiand
56abe3c367
Merge branch 'master' into Surface_mesh_topology-gdamiand
2019-06-28 13:28:50 +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
Guillaume Damiand
fdc10c6e74
Merge branch 'CMap-path_isotopy-gdamiand' of github.com:CGAL/CNRS into CMap-path_isotopy-gdamiand
2019-06-20 16:52:15 +02:00
Guillaume Damiand
1dbc088459
Update licences; move undocumented files to internal (both directory and namespace)
2019-06-20 16:51:53 +02:00
Guillaume Damiand
62167eb065
Add surface mesh topology package in gpl list
2019-06-20 16:13:42 +02:00
Guillaume Damiand
c81464d2c0
Update CHANGES.md
2019-06-20 15:52:47 +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
Liangliang Nan
4588ba5d9d
Merge branch 'master' of https://github.com/CGAL/cgal
2019-06-19 15:08:53 +02:00
Liangliang Nan
010f05dfeb
find GLPK
...
- added FindGLPK.cmake
- try to find SCIP first. If not, try to find GLPK
2019-06-19 15:02:27 +02:00
Laurent Rineau
4fbf00fb8a
CMake>=3.13: opt for for new policies up to 3.15
2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé
77711e4e71
Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio
2019-06-19 11:34:48 +02:00
Mael Rouxel-Labbé
3b53ce20e3
Rename smooth/smooth_along_curvature_flow to smooth_mesh/shape
...
Also fix edge protection in the demo
2019-06-19 10:17:26 +02:00
Mael Rouxel-Labbé
22bd8a943b
Merge smooth_areas and smooth_angles, rework AABB tree, document everything
2019-06-18 16:02:42 +02:00
Laurent Rineau
e260ea1dd4
C++11: remove the need for Boost.Thread, even with CGAL_Core
2019-06-18 15:06:23 +02:00
Mael Rouxel-Labbé
7f6cb0411c
Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF
2019-06-18 08:20:16 +02:00
Mael Rouxel-Labbé
b1a37a0f1e
Update CHANGES.md
2019-06-17 15:19:00 +02:00
Laurent Rineau
6842424fbd
Make CGAL_HEADER_ONLY the default in CGAL-5.0
2019-06-17 15:06:57 +02:00
Laurent Rineau
be0d07d150
Merge pull request #3979 from afabri/CGAL-null_ptr-GF
...
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-17 14:10:35 +02:00
Laurent Rineau
e4353afb13
Merge pull request #3861 from MaelRL/PMP-Add_stitch_boundary_cycle_singular-GF
...
PMP: Introduce `stitch_boundary_cycle`
2019-06-17 13:54:39 +02:00
Laurent Rineau
395e4965b7
Remove use of qt5_use_modules (warned deprecated with CMake-3.14)
2019-06-14 15:15:40 +02:00
Liangliang Nan
92add3db18
Update list_of_whitelisted_headers.cmake
...
added
CGAL/SCIP_mixed_integer_program_traits.h
and
CGAL/GLPK_mixed_integer_program_traits.h
2019-06-12 21:21:55 +02:00
Mael Rouxel-Labbé
bac2593797
Minor CHANGES.md changes
2019-06-07 10:40:53 +02:00
Liangliang Nan
7ac0565037
Added some "changes"
...
For the new package Polygonal Surface Reconstruction and the extension of Solver Interface
2019-06-06 10:53:48 +02:00
Liangliang Nan
fadaee63a8
integrated PolyFit
2019-06-05 17:50:37 +02:00
Andreas Fabri
f7b7b9957f
Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF
2019-06-05 14:47:11 +02:00
Laurent Rineau
e4993273c5
Merge pull request #3864 from danston/Point_set_shape_detection_3-make_it_general_with_region_growing-danston
...
[Feature] Shape detection with region growing
2019-06-05 11:20:29 +02:00
Laurent Rineau
39c8f7ae1f
Merge pull request #3950 from afabri/Triangulation_23-PointWithInfo-GF
...
2D and 3D Triangulations: Unify insertion of range of points with info
2019-06-05 11:20:23 +02:00
Simon Giraudot
0a87e078b9
Add Sphere_3 to changes
2019-06-05 10:51:25 +02:00
Andreas Fabri
4581f1b7a8
Morte replacements
2019-06-05 08:39:55 +02:00
Andreas Fabri
5532b84b4f
nullptr_t -> std::nullptr_t
2019-06-05 07:28:56 +02:00
Laurent Rineau
d05de694ef
typo
2019-06-04 17:00:17 +02:00
Simon Giraudot
9ee478139b
Remove hash for Direction_23/Ray_23 as equality is more complicated
2019-06-04 13:26:05 +02:00
Simon Giraudot
44907c8326
Update CHANGES.md
2019-06-04 10:42:23 +02:00
Dmitry Anisimov
3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston
2019-05-23 10:38:45 +02:00
Laurent Rineau
419032d859
Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
...
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Laurent Rineau
5dc823d509
Merge branch 'releases/CGAL-4.14-branch'
2019-05-23 08:49:56 +02:00
Laurent Rineau
7be5e3fbe5
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-05-23 08:44:39 +02:00
Laurent Rineau
c1a13a0a1e
Merge pull request #3949 from lrineau/Installation-fix_ctest_for_Andreas-GF
...
Fix CTest CGAL tests when binary dir is a sub-directory
2019-05-23 08:31:44 +02:00
Simon Giraudot
69574884a0
Add changes about old PSP API removed
2019-05-22 11:14:32 +02:00
Andreas Fabri
d318f1e938
Update changes.md
2019-05-22 11:08:37 +02:00
Laurent Rineau
268cb59ce1
Merge pull request #3739 from lrineau/Installation-remove_FindBLAS_LAPACK_TAUCS-GF
...
Remove support for BLAS, LAPACK, and TAUCS
2019-05-21 16:37:10 +02:00
Laurent Rineau
7e58feacfe
Merge pull request #3797 from afabri/CGAL-Exact_algebraic-GF
...
Number_types: Add Exact_algebraic
2019-05-21 16:37:07 +02:00
Laurent Rineau
3a9b2fe67f
Merge branch 'releases/CGAL-4.14-branch'
2019-05-21 16:36:28 +02:00
Laurent Rineau
e4c82fa260
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-05-21 16:35:24 +02:00
Laurent Rineau
357fe1e486
Fix CTest CGAL tests when binary dir is a sub-directory
...
When the current binary dir is a sub-directory of the current sources
dir, then the recursive copy of the sources dir to `__exec_test_dir/`
cannot be done. In that case, do not setup the fixture
directory. Tests can still be run in the source directory (and pollute
it).
2019-05-20 12:18:18 +02:00
Laurent Rineau
eeb32f50c3
Merge branch 'master' into PMP-Add_stitch_boundary_cycle_singular-GF
2019-05-20 11:55:38 +02:00
Mael Rouxel-Labbé
213222cc67
Modify CHANGES.md
2019-05-20 11:20:10 +02:00
Mael Rouxel-Labbé
2848158354
Fix typos
2019-05-20 08:54:04 +02:00
Mael Rouxel-Labbé
a120290675
Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio
2019-05-15 14:31:00 +02:00
Mael
c53e7e2c68
Merge branch 'master' into PMP-Locate-GF
2019-05-15 07:59:52 +02:00
Laurent Rineau
90782d4b7f
Revert the merge of two pull-requests that target CGAL-4.14-branch
...
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau
8e872081fc
Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
...
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean
# Conflicts:
# .travis/build_package.sh
# Installation/cmake/modules/CGALConfig_binary.cmake.in
# Installation/cmake/modules/CGALConfig_install.cmake.in
# Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
# Installation/lib/cmake/CGAL/CGALConfig.cmake
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
# Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
# Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
Laurent Rineau
7bcad36d7e
Merge branch 'master' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF
2019-05-14 16:03:28 +02:00
Laurent Rineau
9cbfcee84f
Merge branch 'master' into CGAL-Exact_algebraic-GF
2019-05-13 18:11:00 +02:00
Laurent Rineau
aeb07e63d6
Fix a typo that was reintroduced in the merge
2019-05-13 17:33:43 +02:00
Laurent Rineau
0600f65f99
Merge branch 'master' into CDTplus_2-deprecated-GF
2019-05-13 17:25:57 +02:00
Laurent Rineau
c2e8365303
Actually, it can only work with CMake>=3.11
2019-05-10 17:47:58 +02:00
Laurent Rineau
a0bfaee9eb
Consider CGAL as an imported target
2019-05-10 17:31:17 +02:00
Laurent Rineau
870ff45168
Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
...
Adapt to Boost 1.70
2019-05-07 15:48:03 +02:00
Laurent Rineau
6cff0987ad
Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
...
Adapt to Boost 1.70
2019-05-07 15:47:59 +02:00
Laurent Rineau
aebb058b58
Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
...
Adapt to Boost 1.70
2019-05-07 15:45:00 +02:00
Simon Giraudot
a74233fb9e
Update CHANGES.md
2019-05-07 09:23:08 +02:00
Laurent Rineau
43cc6b2b2d
CGAL_TweakFindBoost must be included before any call to FindBoost
2019-05-06 16:40:50 +02:00
Laurent Rineau
91d7fd4cb2
CGAL_TweakFindBoost must be included first
2019-05-06 16:34:07 +02:00
Laurent Rineau
212a088c5e
That variable CGAL_TweakFindBoost was useless if not set
2019-05-06 16:33:42 +02:00
Laurent Rineau
d8e23fefd2
CGAL requires CMake 3.1, that know about Boost 1.56 or before
2019-05-06 16:33:01 +02:00
Mael
0efaed2095
Merge branch 'master' into PMP-Locate-GF
2019-05-06 15:57:09 +02:00
Laurent Rineau
ba2bf5e506
Merge pull request #3894 from lrineau/CGAL-Qt_version_5.9_or_later-GF
...
Document that Qt 5.9 or later is required
2019-05-06 15:30:24 +02:00
Laurent Rineau
dd703beff1
Merge pull request #3894 from lrineau/CGAL-Qt_version_5.9_or_later-GF
...
Document that Qt 5.9 or later is required
2019-05-06 15:01:58 +02:00
Andreas Fabri
dfc9d6e62d
Cleanup of another change entry heading
2019-05-06 09:09:59 +02:00
Andreas Fabri
8d20e3bf69
Add change entry
2019-05-06 09:08:41 +02:00
Andreas Fabri
0d6459b4df
Add change entry
2019-05-06 08:39:07 +02:00
Laurent Rineau
623fd4f10f
If BUILD_SHARED_LIBS is not defined, use Boost shared libs
2019-05-03 18:39:30 +02:00
Laurent Rineau
9ec3481be2
Document that Qt 5.9 or later is required
2019-04-30 16:41:44 +02:00
Laurent Rineau
149046f8c1
Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse
2019-04-29 19:54:03 +04:00
Laurent Rineau
7812d1b810
Boost: link with imported targets, if they exist
2019-04-29 16:36:04 +02:00
Laurent Rineau
62b346bee5
Fix typos
2019-04-29 16:03:13 +02:00
Laurent Rineau
3cb372be34
Do not search for Boost thread when not needed
2019-04-29 15:24:51 +02:00
Laurent Rineau
af52b353d2
Boost 1.70 uses the CMake Config mode, now
2019-04-26 17:12:54 +02:00
Laurent Rineau
a9fd0a3729
Bug-fix: Boost Thread is a dependency of CGAL_Core only for GNU/g++
...
Previously, it was documented to g++ only, but the code was just
checking "not MSVC", and thus clang was in the set.
2019-04-26 17:12:01 +02:00
Laurent Rineau
6615d1d12d
Change the default value of CGAL_Boost_USE_STATIC_LIBS
...
It is now related to `BUILD_SHARED_LIBS`.
2019-04-26 17:11:24 +02:00
Laurent Rineau
36dba385a0
Add a bunch of new Boost versions
2019-04-26 17:10:49 +02:00
Laurent Rineau
f3bc713103
Typo in a comment
2019-04-26 17:10:35 +02:00
Dmitry Anisimov
6e33c7b22b
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston
2019-04-24 10:34:23 +02:00
Sébastien Loriot
61a2dae54e
fix CHANGES
2019-04-23 10:12:52 +02:00
Sebastien Loriot
295709ab81
Merge pull request #2804 from maxGimeno/Graphics_view-Fix_demo_IO-GF
...
IO: Add IO functions for WKT format
2019-04-23 10:11:48 +02:00
Sébastien Loriot
5a3e72ed56
Merge pull request #3468 from afabri/Kernel-angle-GF
...
[Small Feature] Add angle(Vector_3, Vector_3) to the kernel
2019-04-23 10:02:02 +02:00
Sébastien Loriot
ca755e35a8
Merge pull request #3599 from maxGimeno/Nef_3-Document_Nef_3_to_Polygon_soup-GF
...
Nef_3 : Document convert_nef_polyhedron_to_polygon_soup-GF
2019-04-23 09:52:26 +02:00
Dmitry Anisimov
13d0156482
fixed docs, references, biblio, and license
2019-04-22 13:06:20 +02:00
Mael Rouxel-Labbé
52915956e3
Add PMP/locate.h
2019-04-19 08:39:02 +02:00
Sébastien Loriot
1398af1b0b
Merge remote-tracking branch 'cgal/master' into HEAD
2019-04-12 17:44:31 +02:00
Maxime GIMENO
41033a80be
Merge branch 'master' into Graphics_view-Fix_demo_IO-GF
2019-04-12 16:10:36 +02:00
Sébastien Loriot
c8a3fdaff6
Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF
...
[Small Feature] Reworked CGAL::Color
2019-04-12 15:54:30 +02:00
Sébastien Loriot
1a97dcfb8e
Merge pull request #3441 from afabri/PMP-centroid-GF
...
[Small Feature] Add centroid(TriangleMesh) to Polygon Mesh Processing
2019-04-12 15:45:48 +02:00
Sébastien Loriot
db65bd8ecc
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'
2019-04-11 21:38:48 +02:00
albert-github
1dd7473818
Correction of links
...
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Simon Giraudot
4745f24f2d
Fix link test
2019-04-11 09:38:49 +02:00
Simon Giraudot
d8b51a9672
Merge remote-tracking branch 'laurent/Installation-remove_FindBLAS_LAPACK_TAUCS-GF' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF
2019-04-09 15:22:45 +02:00
Simon Giraudot
d314711eaf
Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF
2019-04-09 15:00:56 +02:00
Maxime Gimeno
78db3f646d
Solve conflicts
2019-04-09 10:04:44 +02:00
Laurent Rineau
04bef2b071
Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
...
Update for cpp14
2019-04-08 15:59:28 +02:00
Laurent Rineau
dd2c98eb85
Merge branch 'releases/CGAL-4.14-branch'
2019-04-08 15:59:14 +02:00
Laurent Rineau
68f321c58d
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-04-08 15:58:27 +02:00
Laurent Rineau
b86532d357
Merge pull request #3830 from lrineau/Installation-fix_Windows_DLL_verinfo-lrineau
...
Fix CGAL DLLs verinfo on Windows
2019-04-08 15:57:31 +02:00
Laurent Rineau
ae1e01c983
Merge pull request #3840 from lrineau/Installation-remove_GMP_IN_CGAL_AUXILIARY-GF
...
Remove (GMP|MPFR)_IN_CGAL_AUXILIARY
2019-04-08 15:57:29 +02:00
Laurent Rineau
b392643a98
This branch now targets 4.13.2.
2019-04-05 14:50:41 +02:00
Laurent Rineau
d07a2c9184
Remove (GMP|MPFR)_IN_CGAL_AUXILIARY
...
There was a bug in `FindGMP.cmake` and `FindMPFR.cmake`: they were
using the undefined macro `cache_set`.
I have removed those variables definitions, and wrote the code
differently where they were used.
2019-04-04 15:25:01 +02:00
Laurent Rineau
5a67ea92fc
Fix the verinfo of CGAL DLLs, on Windows
...
And fix the test files.
2019-04-03 14:15:58 +02:00
Andreas Fabri
f727fb9adc
Add to CHANGES.md
2019-04-03 14:15:57 +02:00
Laurent Rineau
85047bcb61
Sneak a new feature in this branch: detect unused .cpp files
...
For the moment, the feature is far from being ready:
- in case of header-only, the .cpp sources files of CGAL libraries are
reported,
- when a dependency for a test/examples is missing, the corresponding
.cpp files is reported,
- and I have no clue which CMake version is required.
But I found real issues.
By default, the feature is OFF. It will only be activated if the CMake
variable or cache variable `CGAL_CHECK_UNUSED_CPP_FILES` is true. We
might activate it on a per-directory basis... or have it by default,
and deactivate it per-directory. We'll see. For the moment, let's keep
it deactivated.
2019-04-03 14:11:50 +02:00
Simon Giraudot
428195e711
Replace link test using Random instead of Color
2019-04-03 11:51:29 +02:00
Laurent Rineau
8539c09179
CGAL requires C++14.
2019-04-01 18:35:58 +02:00
Laurent Rineau
3a32f3f3ef
Restore CGAL::cpp11 temporarily
...
This reverts commit 04978d8aae .
2019-04-01 18:27:35 +02:00
Laurent Rineau
e09f692e74
master now targets CGAL 5.0
2019-03-29 16:02:15 +01:00
Laurent Rineau
57a41b3d2a
Towards CGAL-4.14.1
2019-03-29 15:59:03 +01:00
Laurent Rineau
84b9328619
Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch
2019-03-29 15:49:12 +01:00
Laurent Rineau
8c4032262f
Merge pull request #3807 from lrineau/Installation-fix_MPFR_static-GF
...
Fix the order of link when GMP is a static lib
2019-03-28 16:49:51 +01:00
Laurent Rineau
99ca804f6d
Maybe tonight's internal release will be CGAL-4.14 final
2019-03-28 16:45:09 +01:00
Laurent Rineau
4b7cc4a896
Fix the order of link of GMPXX when GMP is a static library.
2019-03-28 09:04:03 +01:00
Laurent Rineau
fc81d3bfec
Merge pull request #3780 from afabri/CGAL-links-GF
...
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
Laurent Rineau
c988d7d1af
Merge pull request #3807 from lrineau/Installation-fix_MPFR_static-GF
...
Fix the order of link when GMP is a static lib
2019-03-27 18:04:59 +01:00
Laurent Rineau
e9f36ff557
Prepare for CGAL-4.14-beta4
2019-03-27 18:03:07 +01:00
Laurent Rineau
310ce89b91
Fix the order of link when GMP is a static lib
2019-03-27 17:51:24 +01:00
Laurent Rineau
d0cbf82b04
Remove the CMake variable CGAL_USE_GMP when CGAL_DISABLE_GMP is flipped
2019-03-27 14:16:50 +01:00
Laurent Rineau
ea145c71fe
Merge pull request #3759 from maxGimeno/Cross_compilation-Update_scripts-GF
...
Testsuite : Use ctest
2019-03-26 17:01:56 +01:00
Laurent Rineau
15d74af234
Bump the SONAME of libCGAL_Qt5.so
...
```
ABI changes between build CGAL-4.14-0.1beta2.fc30 and its latest stable build
================================================================================
This file contains possible ABI changes which have occurred due to this package update against latest stable build available in koji for the given Fedora release.
If you want to filter out these kind of ABI changes in the future, you can add a proper .abignore file to this package. To know more about how to write one, please look at the wiki page https://fedoraproject.org/wiki/Taskotron/Tasks/dist.abicheck#filtering .
On armv7hl architecture
*************************
* No ABI change between:
CGAL-devel-4.13-3.fc30.armv7hl.rpm
CGAL-devel-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 8.88 second(s).
* ABI changes found between:
CGAL-4.13-3.fc30.armv7hl.rpm
CGAL-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 11.54 second(s). Please review them.
================ changes of 'libCGAL_Qt5.so.13.0.2'===============
Functions changes summary: 0 Removed, 1 Changed, 0 Added function
Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
1 function with some indirect sub-type change:
[C]'method CGAL::Qt::DemosMainWindow::DemosMainWindow(QWidget*, Qt::WindowFlags)' at DemosMainWindow_impl.h:62:1 has some indirect sub-type changes:
return type changed:
in pointed to type 'class CGAL::Qt::DemosMainWindow' at DemosMainWindow.h:52:1:
type size changed from 544 to 608 (in bits)
1 data member insertion:
'QSettings CGAL::Qt::DemosMainWindow::settings', at offset 544 (in bits) at DemosMainWindow.h:129:1
================ end of changes of 'libCGAL_Qt5.so.13.0.2'===============
Removed binaries:
/usr/lib/libCGAL_ImageIO.so.13.0.2, SONAME: libCGAL_ImageIO.so.13
Added binaries:
/usr/lib/libCGAL_ImageIO.so.14.0.0, SONAME: libCGAL_ImageIO.so.14
* No ABI change between:
CGAL-demos-source-4.13-3.fc30.armv7hl.rpm
CGAL-demos-source-4.14-0.1beta2.fc30.armv7hl.rpm
ABI comparison took 8.67 second(s).
```
https://taskotron.fedoraproject.org/artifacts/all/bfca5e3c-4aff-11e9-b891-525400fc9f92/tests.yml/CGAL-4.14-0.1beta2.fc30.log
2019-03-26 10:49:31 +01:00
Laurent Rineau
bc6954af01
Fix an error in Fedora RPM
...
```
CGAL-devel.x86_64: E: zero-length /usr/lib64/cmake/CGAL/config/support/test_syntaxonly.cpp
```
https://taskotron.fedoraproject.org/artifacts/all/bf72d02c-4aff-11e9-a48a-525400fc9f92/tests.yml/CGAL-4.14-0.1beta2.fc30.log
2019-03-26 10:49:00 +01:00
Andreas Fabri
8014920ae0
Fix CHANGES.md
2019-03-21 13:36:27 +01:00
Maxime Gimeno
43167252fa
Fix cin management in CGAL_add_tests
2019-03-21 11:37:39 +01:00
Laurent Rineau
6eab4c014c
Update the handle of .cin files with CGAL_RUN_TESTS_THROUGH_SSH
2019-03-21 09:52:53 +01:00
Andreas Fabri
a472c24185
http:/www.boost.org -> https://www.bost.org
2019-03-20 08:59:22 +01:00
Laurent Rineau
4782ea1665
Fix the *installed* header-only CGALConfig.cmake
...
The previous installed version of `CGALConfig.cmake`, when
`CGAL_HEADER_ONLY` is true, was hard-coding a path `../../../`,
relative to the location of itself. It might be that the CMake modules
are not installed in a sub-directory with three components, relatively
to the prefix.
That way of doing it buggy. And that triggered issue with the cgal
port in vcpkg:
https://github.com/Microsoft/vcpkg/pull/5734
This patch is just another hack: it hardcodes that the relative path
can be any of:
- `../`,
- `../../`, or
- `../../../`.
2019-03-19 16:49:31 +01:00
Maxime Gimeno
1a6ef33010
WIP from git and upload to private page
2019-03-14 16:36:11 +01:00
Laurent Rineau
43d1948396
master now targets a possible CGAL-4.14-beta3
2019-03-13 17:15:45 +01:00
Maxime Gimeno
330c6ec9b1
Merge pull request #3759 from maxGimeno/Cross_compilation-Update_scripts-GF
...
Testsuite : Use ctest
2019-03-12 17:04:19 +01:00
Maxime Gimeno
64cfc19d68
Remove -d option. Any HOST declared as not localhost will be considered as a remote host and launch the cross compilation.
2019-03-12 14:58:11 +01:00
Maxime Gimeno
7c0d23b18f
Fix CGAL_DIR and change names in CGAL_add_tests
2019-03-12 10:13:07 +01:00
Maxime Gimeno
0b31e6e5d8
Merge remote-tracking branch 'cgal/master' into Graphics_view-Fix_demo_IO-GF
2019-03-07 14:01:02 +01:00
Laurent Rineau
ca67ac5c1f
Remove all mentions of BLAS, LAPACK, and TAUCS in our CMake scripts
2019-03-07 09:40:08 +01:00
Maxime Gimeno
aa76cd02b6
Use a single script for testsuite with or without docker
2019-03-06 14:17:48 +01:00
Laurent Rineau
911e44a1fe
Prepare for beta2
2019-03-04 18:35:48 +01:00
Laurent Rineau
f704c838fd
Rewrap CHANGES.md
2019-03-01 16:27:22 +01:00
Laurent Rineau
01e5727a50
Prepare CGAL-4.14-beta1
2019-03-01 16:27:11 +01:00
Maxime Gimeno
17079b0d53
Kill remote process if ssh is killed (ctrl+c or timeout)
2019-03-01 15:43:58 +01:00
Laurent Rineau
3f66d8f00a
Merge pull request #3718 from lrineau/CGAL-SOVERSION_for_CGAL_ImageIO-GF
...
Allow to have different SOVERSION for each CGAL libraries
2019-02-28 20:54:43 +01:00
Maxime Gimeno
902070d4d1
Add a label for push__oh_
2019-02-28 16:32:01 +01:00
Laurent Rineau
8eee6f3e0c
Allow to have different SOVERSION for each CGAL libraries
...
In CGAL-4.14, I would like to have `libCGAL.so.13` (to keep
compatibility), but `libCGAL_Image.so.14` (to break compatibility).
2019-02-28 14:26:02 +01:00
Maxime Gimeno
7407a432ce
Merge branch 'master' of https://github.com/CGAL/cgal into Cross_compilation-Update_scripts-GF
2019-02-28 11:59:04 +01:00
Laurent Rineau
d5664ad071
typo
2019-02-25 09:54:04 +00:00
Laurent Rineau
5e96380e55
Merge branch 'master' into Bso-validation-efif
2019-02-25 09:53:15 +00:00
Efi Fogel
07f9ac6430
Fixed the validation of orientation. (This time fixed it right...)
2019-02-23 11:20:56 +02:00
Laurent Rineau
5199eb70ee
Merge pull request #3283 from imiordanov/Periodic_4_hyperbolic_triangulation_2-IIordanov
...
New packages: Hyperbolic_triangulation_2 / Periodic_4_hyperbolic_triangulation_2
2019-02-22 16:39:12 +01:00
Maxime Gimeno
42f3928de3
Fix CGAL_DISABLE_GMP
2019-02-22 16:00:53 +01:00
Laurent Rineau
7cf4a1fff8
Merge pull request #3501 from lrineau/CGAL-fix_with_LEDA_without_CGAL_Core-GF
...
Partially fix the testsuite with LEDA instead of GMP
2019-02-22 10:04:22 +00:00
Laurent Rineau
5376673151
Fix the testsuite of Arrangement_on_surface_2
2019-02-21 17:00:53 +01:00
Maxime Gimeno
13e7f7633c
Fix push__of_ in arrangement
2019-02-21 16:56:34 +01:00
Laurent Rineau
2ddee24f1a
Fix the dependencies
2019-02-21 16:09:42 +01:00
Laurent Rineau
1e17519384
Fixes
...
- The dependencies of push_of__ tests were not correct.
- Fix the handling of tests with .cin, when ssh/scp are used.
2019-02-21 15:49:48 +01:00
Maxime Gimeno
c01eddb62a
Remove unused LD_LIBRARY_PATH
2019-02-21 15:47:12 +01:00
Maxime Gimeno
a52f7198d2
WIP SSH
2019-02-20 16:46:28 +01:00
Laurent Rineau
fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
...
Fix warnings (Add/remove copy constructors, and other warnings)
Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
Laurent Rineau
962afbfade
Merge pull request #3343 from sgiraudot/Point_set_3-v2-GF
...
[Small Feature] Point Set 3 v2
2019-02-13 15:38:53 +01:00
Maxime Gimeno
ca4f5e12ed
Merge remote-tracking branch 'cgal/master' into Periodic_4_hyperbolic_triangulation_2-IIordanov
2019-02-12 15:58:49 +01:00
Laurent Rineau
82403fb131
Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse
2019-02-12 08:24:43 +00:00
Andreas Fabri
b84f54a9e3
Do not define the macro CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS for VC2013 as suggested in Issue #3436
2019-02-08 09:46:18 +01:00
Laurent Rineau
9b71af64c8
Add -Wno-cast-function-type to fix a warning in Qt5
...
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.14-Ic-117/Polyhedron_Demo/TestReport_lrineau_Ubuntu-latest-GCC6-CXX1z.gz
```
/usr/local/bin/c++ -DCGAL_EIGEN3_ENABLED -DCGAL_TEST_SUITE=1 -DCGAL_USE_GMP -DCGAL_USE_MPFR -DCGAL_USE_ZLIB=1 -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NO_KEYWORDS -DQT_OPENGL_LIB -DQT_SCRIPT_LIB -DQT_SVG_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -DSCENE_IMAGE_GL_BUFFERS_AVAILABLE -DUSE_FORWARD_DECL -Dpolyhedron_demo_EXPORTS -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/polyhedron_demo_autogen/include -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/./CGAL_demo -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/./include -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/. -isystem /usr/include/x86_64-linux-gnu -I/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/include -I/mnt/testsuite/include -isystem /usr/include/eigen3 -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtOpenGL -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/usr/include/x86_64-linux-gnu/qt5/QtSvg -I/usr/include/x86_64-linux-gnu/qt5/QtXml -I/usr/include/x86_64-linux-gnu/qt5/QtScript -DDONT_USE_BOOST_PROGRAM_OPTIONS -Wall -Wextra -std=c++1z -frounding-math -fPIC -Wno-deprecated-copy -Wall -frounding-math -fPIC -std=gnu++11 -o CMakeFiles/polyhedron_demo.dir/MainWindow.cpp.o -c /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp
In file included from /usr/include/x86_64-linux-gnu/qt5/QtScript/QScriptEngine:1,
from /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.h:10,
from /home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp:4:
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h: In instantiation of 'int qScriptRegisterMetaType(QScriptEngine*, QScriptValue (*)(QScriptEngine*, const T&), void (*)(const QScriptValue&, T&), const QScriptValue&, T*) [with T = CGAL::Three::Scene_item*]':
/home/cgal_tester/build/src/cmake/platforms/Ubuntu-latest-GCC6-CXX1z/test/Polyhedron_Demo/MainWindow.cpp:313:67: required from here
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h:390:18: warning: cast between incompatible function types from 'QScriptValue (*)(QScriptEngine*, CGAL::Three::Scene_item* const&)' to 'QScriptEngine::MarshalFunction' {aka 'QScriptValue (*)(QScriptEngine*, const void*)'} [-Wcast-function-type]
390 | eng, id, reinterpret_cast<QScriptEngine::MarshalFunction>(toScriptValue),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/x86_64-linux-gnu/qt5/QtScript/qscriptengine.h:391:9: warning: cast between incompatible function types from 'void (*)(const QScriptValue&, CGAL::Three::Scene_item*&)' to 'QScriptEngine::DemarshalFunction' {aka 'void (*)(const QScriptValue&, void*)'} [-Wcast-function-type]
391 | reinterpret_cast<QScriptEngine::DemarshalFunction>(fromScriptValue),
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```
2019-02-07 17:49:14 +01:00
Laurent Rineau
9a03d47cb0
Merge pull request #3297 from maxGimeno/Stream_support-Dont_use_vtk_for_vtu-GF
...
Stream support: VTP and VTU writing functions
2019-02-07 13:31:23 +01:00
Laurent Rineau
1a45e1c753
Merge pull request #3535 from sgiraudot/Classification-Neural_network_and_parallelized_random_forest-GF
...
[Small Feature] Classification: Neural Network and parallelized Random Forest
2019-02-07 13:31:20 +01:00
Laurent Rineau
0ca486665a
Merge pull request #3654 from maxGimeno/Triangulation_fix_tests_for_clang-GF
...
Triangulation: Fix the tests for GCC<4.4 so it wont match clang.
2019-02-07 13:30:46 +01:00
Simon Giraudot
62a50da351
Update CHANGES.md
2019-02-07 11:36:05 +01:00
Laurent Rineau
27f1dc4a62
Do no always search for GMPXX
...
There is a kind of bug in `UseCGAL.cmake`, that enables GMPXX if it is
found, even if `WITH_GMPXX` is `OFF`. If GMPXX is never search for,
that should avoid it to be accidentally activated on platforms we do
not want it.
2019-02-07 10:12:51 +01:00
Laurent Rineau
3088234e67
CGAL requires C++14.
2019-02-06 14:49:17 +01:00
Laurent Rineau
2455affba0
Move the addition of -Wno-deprecated-copy to CGAL_Qt5 setup
...
That way:
- that will work, even if CGAL CXX_FLAGS are copied (when hte CMake
options `CGAL_DEV_MODE` or `RUNNING_CGAL_AUTO_TEST` are `ON`),
- that will affect all CGAL Qt5 demos at once.
2019-02-06 11:47:44 +01:00
Laurent Rineau
02690350ee
Replace include(CTest) by minimal usage
...
- Define the option `BUILD_TESTING`
- Call to `enable_testing()` if `BUILD_TESTING` is on.
2019-02-04 15:30:24 +01:00
Laurent Rineau
f37ac9cfc6
Fix non-header-only CGALConfig.cmake as regards to CGAL_Core
...
... and then fix the `CMakeLists.txt` of HDT2_demo.
2019-02-04 15:09:07 +01:00
Maxime Gimeno
de8dde79f4
Replace not by ! in preprocessor directives
2019-02-04 10:40:00 +01:00
Marc Glisse
34cbb9cd4b
Make Epeck_d work & C++14-only cleanups
...
Still some rough edges:
1) double tab[]={.1,.2,.3}; Point_d p(tab+0,tab+3); lazily stores
iterators to tab, so tab had better still be alive when we need
update_exact.
2) One functor (point on a sphere) cannot be done exactly exactly with
a representation center+squared radius.
3) Several hacks that make this not as generic as it should be.
2019-02-03 23:16:28 +01:00
Maxime Gimeno
e2f2c63e76
Modifications after review
2019-01-23 11:25:00 +01:00
Laurent Rineau
c9164a0660
Merge branch 'master' into Stream_support-Dont_use_vtk_for_vtu-GF
2019-01-22 12:06:08 +01:00
Maxime Gimeno
18d9e72124
Fix doc and update CHANGES.md
2019-01-22 11:19:38 +01:00
Maxime Gimeno
549568a954
Fix conflicts
2019-01-22 10:08:48 +01:00
Laurent Rineau
f5a8686cf3
Merge pull request #3439 from aboudev/VSA-lingjie
...
New package: Surface_mesh_approximation
2019-01-22 09:17:35 +01:00
Laurent Rineau
0c1517d97e
Merge pull request #3446 from sloriot/Installation-extra_slash
...
Clean-up include dir in CGALconfig.cmake
2019-01-22 09:15:24 +01:00
Laurent Rineau
cd75eac35a
Merge pull request #3486 from efifogel/Ms_2-empty_ouetr_boundary-efif
...
Fixed face filtering in case one of the summands does not have an out…
2019-01-22 09:15:21 +01:00
Laurent Rineau
026868a294
Merge pull request #3552 from lrineau/Image_IO-Image_3_maybe_not_own_the_data-GF
...
Add a non-documented API, to allow CGAL::Image 3 not to own its data
2019-01-22 09:15:15 +01:00
Laurent Rineau
a8c6505642
Merge pull request #3446 from sloriot/Installation-extra_slash
...
Clean-up include dir in CGALconfig.cmake
2019-01-22 09:13:23 +01:00
Maxime Gimeno
d52718f312
Fix Conflicts
2019-01-21 10:03:31 +01:00
Laurent Rineau
11db055bfe
Modify CHANGES.md
...
Split the changes into two different paragraphs (2D/3D meshes, and
BGL).
2019-01-17 16:03:48 +01:00
Laurent Rineau
1754057d24
My changes to write_vtu
2019-01-16 16:50:45 +01:00
Laurent Rineau
40cf3869ba
My changes for write_vtp
2019-01-16 16:15:01 +01:00
Maxime Gimeno
cb10422e3c
Fix indentation and markdown
2019-01-16 10:44:30 +01:00
Maxime Gimeno
2a49dfcb05
Fix conflict
2019-01-11 09:47:34 +01:00
Simon Giraudot
dc9d52f485
Update filename in whitelisted headers
2019-01-10 11:08:56 +01:00
Laurent Rineau
c9fb876574
Merge branch 'master' into VSA-lingjie
2019-01-10 10:13:09 +01:00
Maxime Gimeno
3b1b6e2401
Merge remote-tracking branch 'cgal/master' into Graphics_view-Fix_demo_IO-GF
2019-01-09 12:35:04 +01:00
Maxime Gimeno
1006be85bd
Fix Conflicts
2019-01-09 12:29:20 +01:00
Iordan Iordanov
59b212968e
Added new packages to CHAMGES.md
2019-01-08 17:43:20 +01:00
Andreas Fabri
6b00750ecf
Add to CHANGES.md
2019-01-08 09:47:12 +01:00
Laurent Rineau
65a31133fa
Merge branch 'master' into Ms_2-empty_ouetr_boundary-efif
2019-01-07 16:24:42 +01:00
Simon Giraudot
e5c2d12ce3
Merge branch 'Classification-Neural_network_and_parallelized_random_forest-GF-old' into Classification-Neural_network_and_parallelized_random_forest-GF
2019-01-07 11:54:41 +01:00
Simon Giraudot
c81fbe4688
Move all classifiers based on other libraries to dedicated namespaces
2019-01-07 11:50:02 +01:00
Simon Giraudot
3b246294bf
Update CHANGES.md
2019-01-04 14:39:29 +01:00
Sébastien Loriot
0ec2fa5136
update changes
2018-12-21 13:14:23 +01:00
Simon Giraudot
3cc1b995be
Merge remote-tracking branch 'mine/Classification-Neural_network_and_parallelized_random_forest-GF' into Classification-Neural_network_and_parallelized_random_forest-GF
2018-12-21 10:31:00 +01:00
Mael Rouxel-Labbé
15fe22cc6d
Micro fix to gpl.h.in and added licenses for HT_2 and P4HT_2
...
(re-generated all the licenses on the way)
2018-12-19 18:38:05 +01:00
Laurent Rineau
47cdc92064
Merge pull request #3463 from lrineau/CGAL-Fix_CTest-GF
...
Fix CTest after #3413
2018-12-19 16:12:29 +01:00
Laurent Rineau
57b2fbdbfb
Merge pull request #3485 from afabri/BGL-write_wrl-GF
...
BGL: Add write_wrl() for FaceGraph
2018-12-19 16:12:26 +01:00
Laurent Rineau
1cb63b5e78
Bump the SONAME
2018-12-17 15:21:59 +01:00
Simon Giraudot
847a6d8a8f
Add TensorFlow_neural_network_classifier to whitelisted headers
2018-12-14 10:22:11 +01:00
Laurent Rineau
f6e83cd23e
Move the definition of CGAL_USE_FILE in case of early return()
2018-12-13 10:59:00 +01:00
Simon Giraudot
3b0220482a
Update CHANGES.md
2018-12-12 10:06:33 +01:00
Laurent Rineau
c14fda590d
Merge branch 'master' into CGAL-Fix_CTest-GF
2018-12-10 16:52:33 +01:00
Laurent Rineau
a328ce9470
Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch
2018-12-10 15:07:12 +01:00
Laurent Rineau
950fd19be6
Merge pull request #3482 from lrineau/Installation-LEDA_remove_ffriend_injection-GF
...
Try to use LEDA without -ffriend-injection
2018-12-10 14:38:23 +01:00
Simon Giraudot
f520f9eb11
First version of NN with TensorFlow
2018-12-06 14:59:57 +01:00
Laurent Rineau
a9ef1dd0a5
Really test with LEDA!!
2018-11-30 16:56:08 +01:00
Lingjie Zhu
73c2a418c6
fix SPDX license indentifier
2018-11-30 10:45:24 +01:00
Lingjie Zhu
a4ef69a631
add package license
2018-11-30 15:24:16 +08:00
Andreas Fabri
c570e86661
Removed unused typedef; Added to CHANGES.md
2018-11-29 08:12:26 +01:00
Efi Fogel
0ff6b941cb
Added a note about a fix to the minkowski_sum_2() function in the 2D Minkowski sum package
2018-11-28 13:06:40 +02:00
Laurent Rineau
81cf49efb1
Fix the construction of CGAL_ROOT in header-only
...
In header-only, `CGALConfig.cmake` constructs the path to the root of
the CGAL installation. It used to use `../` a lot, to go back in
parent directories, but:
- that was... ugly,
- and Ninja saw a problem with that (a warning about the path to
`print_GMP_version.cpp`).
`CGALConfig.cmake` Now uses the CMake command `get_filename_component`.
2018-11-28 09:46:53 +01:00
Laurent Rineau
263a5715f2
Try to use LEDA without -ffriend-injection
2018-11-26 16:34:12 +01:00
Maxime Gimeno
7b13f4a969
Add misisng license header, rename vtu functions and update change.md
2018-11-23 10:11:23 +01:00
Maxime Gimeno
33482dc532
Fix conflicts
2018-11-21 10:55:09 +01:00
Laurent Rineau
c28c0a4b2d
Fix a bug with CTest in non-header-only
...
The pull-request https://github.com/CGAL/cgal/pull/3413 has introduced
a side-effect: CTest was broken when `CGAL_HEADER_ONLY=OFF`, for all
tests using a `.cin` or `.cmd` file. That is due to the variable
`CGAL_CURRENT_SOURCE_DIR` that was only filled by `UseCGAL.cmake`.
Now that we forbid CGAL directories without `CMakeLists.txt`, that
variable `CGAL_CURRENT_SOURCE_DIR` is now useless, and can be removed:
`CMAKE_CURRENT_SOURCE_DIR` is sufficient. That fixes the bug with
CTest, and also makes the CMake code a bit simpler.
2018-11-19 14:33:54 +01:00
Sebastien Loriot
727824eda6
Merge pull request #3325 from efifogel/Aos_2-fixes-efif
...
Aos 2: fixes
2018-11-14 18:50:12 +01:00
Andreas Fabri
5b62f06871
Fix merge conflicts
2018-11-12 13:02:52 +01:00
Sébastien Loriot
66f2d5404e
remove extra /
2018-11-08 17:12:12 +01:00
Guillaume Damiand
0c3878694b
Include CGAL_Common.cmake, where variable EIGEN3_USE_FILE is defined.
2018-11-06 11:03:59 +01:00
Guillaume Damiand
7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand
2018-11-05 07:32:58 +01:00
Guillaume Damiand
ee4f7c5cd9
Resolve conflict
2018-11-02 19:13:25 +01:00
Sébastien Loriot
bc073d6670
Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch'
2018-11-02 10:57:00 +01:00
Sébastien Loriot
9e9df2c196
Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD
2018-11-02 10:55:57 +01:00
Sébastien Loriot
d940632471
Merge pull request #3258 from MaelRL/PMP-Filter_degenerate_polygon_soup_input-GF
...
PMP: repair polygon soup
2018-11-02 10:37:58 +01:00
Sébastien Loriot
056c778305
Merge pull request #3370 from maxGimeno/AABB_tree-Change_facegraph_triangle_primitive_id-GF
...
Aabb_tree: change the id of AABB_face_graph_triangle_primitive and AABB_halfedge_graph_segment_primitive
2018-11-02 10:34:26 +01:00
Sébastien Loriot
e925b1aba6
Merge pull request #3225 from maxGimeno/Demo-Remove_polyhedron_item-GF
...
Polyhedron demo: remove the Scene_polyhedron_item
2018-10-30 15:50:17 +01:00
Maxime Gimeno
cbf3e04fa6
Doc fix.
2018-10-30 14:15:01 +01:00
Maxime Gimeno
08a98a5603
Update Changes.md
2018-10-30 11:51:34 +01:00
Maxime Gimeno
50108dc627
Fix wrong policy setting
2018-10-29 14:25:47 +01:00
Maxime Gimeno
63488d81d1
Update Changes and doc
2018-10-29 12:59:44 +01:00
Laurent Rineau
01eaab049d
Fix the logic: search for the TARGET, and not the content of WITH_CGAL...
2018-10-26 16:30:39 +02:00
Guillaume Damiand
9e3f264e2c
Add an include CGAL_Common.cmake
2018-10-23 13:44:00 +02:00
Guillaume Damiand
7e022bacf6
Add a debug message, trying to understand where the problem comes from...
2018-10-23 09:09:45 +02:00
Guillaume Damiand
d1a027bd2c
Github lost my last push git status
2018-10-22 10:39:31 +02:00
Guillaume Damiand
152f34fd56
Change order of things, to be able to do include(CGAL_CreateSingleSourceCGALProgram.cmake) in all cases.
2018-10-22 10:31:06 +02:00
Guillaume Damiand
8f61243a13
Move one include after the definition of CGAL_MODULES_DIR
2018-10-19 10:18:37 +02:00
Laurent Rineau
980d254517
Re-add a missing line
2018-10-19 09:31:32 +02:00
Laurent Rineau
0dd59c1cfd
Include CGAL_CreateSingleSourceCGALProgram.cmake in case of early return
2018-10-18 16:25:32 +02:00
Guillaume Damiand
92ba7fa6c9
Update minimum cmake required version in all CMakeLists.txt
2018-10-18 14:49:23 +02:00
Efi Fogel
0446b84a8c
Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif
2018-10-15 12:04:37 +03:00
Sébastien Loriot
9d88ce0826
update changes
2018-10-09 14:15:26 +02:00
Maxime Gimeno
aa10bcc5b0
Update changes.md
2018-10-09 14:15:25 +02:00