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
4d5b4c950a
Merge pull request #4085 from maxGimeno/Update_Find_TBB-GF
...
Update FindTBB.cmake
2019-07-26 18:27:00 +02:00
5d47146cd6
Fix in header-only
2019-07-25 16:14:50 +02:00
fbf163d244
Fix when CGAL_USE_FILE is not included
2019-07-25 16:13:08 +02:00
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
82567685ad
Add include of CGAL_taret_use_TBB in the end of the new FindTBB
2019-07-19 09:34:12 +02:00
7f604308d0
Update FindTBB.cmake
2019-07-15 12:45:28 +02:00
e79bfd5d03
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-07-03 11:10:03 +02:00
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
7be5e3fbe5
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-05-23 08:44:39 +02:00
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
e4c82fa260
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-05-21 16:35:24 +02:00
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
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
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
c2e8365303
Actually, it can only work with CMake>=3.11
2019-05-10 17:47:58 +02:00
a0bfaee9eb
Consider CGAL as an imported target
2019-05-10 17:31:17 +02:00
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
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
43cc6b2b2d
CGAL_TweakFindBoost must be included before any call to FindBoost
2019-05-06 16:40:50 +02:00
91d7fd4cb2
CGAL_TweakFindBoost must be included first
2019-05-06 16:34:07 +02:00
212a088c5e
That variable CGAL_TweakFindBoost was useless if not set
2019-05-06 16:33:42 +02:00
d8e23fefd2
CGAL requires CMake 3.1, that know about Boost 1.56 or before
2019-05-06 16:33:01 +02:00
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
623fd4f10f
If BUILD_SHARED_LIBS is not defined, use Boost shared libs
2019-05-03 18:39:30 +02:00
9ec3481be2
Document that Qt 5.9 or later is required
2019-04-30 16:41:44 +02:00
7812d1b810
Boost: link with imported targets, if they exist
2019-04-29 16:36:04 +02:00
3cb372be34
Do not search for Boost thread when not needed
2019-04-29 15:24:51 +02:00
af52b353d2
Boost 1.70 uses the CMake Config mode, now
2019-04-26 17:12:54 +02:00
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
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
36dba385a0
Add a bunch of new Boost versions
2019-04-26 17:10:49 +02:00
f3bc713103
Typo in a comment
2019-04-26 17:10:35 +02:00
1dd7473818
Correction of links
...
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
68f321c58d
Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
2019-04-08 15:58:27 +02:00
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
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
b392643a98
This branch now targets 4.13.2.
2019-04-05 14:50:41 +02:00
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
5a67ea92fc
Fix the verinfo of CGAL DLLs, on Windows
...
And fix the test files.
2019-04-03 14:15:58 +02:00
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
57a41b3d2a
Towards CGAL-4.14.1
2019-03-29 15:59:03 +01:00
84b9328619
Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch
2019-03-29 15:49:12 +01:00
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
99ca804f6d
Maybe tonight's internal release will be CGAL-4.14 final
2019-03-28 16:45:09 +01:00
4b7cc4a896
Fix the order of link of GMPXX when GMP is a static library.
2019-03-28 09:04:03 +01:00
fc81d3bfec
Merge pull request #3780 from afabri/CGAL-links-GF
...
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
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
e9f36ff557
Prepare for CGAL-4.14-beta4
2019-03-27 18:03:07 +01:00
310ce89b91
Fix the order of link when GMP is a static lib
2019-03-27 17:51:24 +01:00
Laurent Rineau
Maxime Gimeno
albert-github