Commit Graph

721 Commits

Author SHA1 Message Date
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
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
Maxime Gimeno 7f604308d0 Update FindTBB.cmake 2019-07-15 12:45:28 +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
Laurent Rineau 623fd4f10f If BUILD_SHARED_LIBS is not defined, use Boost shared libs 2019-05-03 18:39:30 +02:00
Laurent Rineau 7812d1b810 Boost: link with imported targets, if they exist 2019-04-29 16:36:04 +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
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 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 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
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 4b7cc4a896 Fix the order of link of GMPXX when GMP is a static library. 2019-03-28 09:04:03 +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 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
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 263a5715f2 Try to use LEDA without -ffriend-injection 2018-11-26 16:34:12 +01:00
Sébastien Loriot 66f2d5404e remove extra / 2018-11-08 17:12:12 +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
Maxime Gimeno 50108dc627 Fix wrong policy setting 2018-10-29 14:25:47 +01:00
Laurent Rineau f8a37e59ef Fix issue #3317 by removing the unused module FindGLEW.cmake 2018-09-17 14:41:54 +02:00
Laurent Rineau 919b9afe92 Merge pull request #3229 from lrineau/Installation-fix_compatibility_with_CMake_3.13-GF
Set CMP0077 to OLD (new in CMake-3.13)
2018-07-16 11:12:56 +02:00
Laurent Rineau 6079b3847e Set CMP0077 to OLD (new in CMake-3.13) 2018-07-13 11:24:50 +02:00
Laurent Rineau ab973c90e0 Merge pull request #2739 from lrineau/Mesh_3-improve_polylines_to_protect-GF
Mesh_3 new improvements: polylines_to_protect(), new API of Labeled_mesh_domain_3
2018-06-01 17:25:52 +02:00
Maxime Gimeno fbe5ee39c7 Update cmake files 2018-05-28 17:18:59 +02:00
Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Laurent Rineau 265a81bf76 Merge pull request #2967 from maxGimeno/CGAL-With_QGLViewer-GF
CGAL_Qt5: include QGLViewer
2018-05-28 13:58:10 +02:00
Laurent Rineau 39c913a090 CERR: create the file before using it 2018-05-24 14:44:48 +02:00
Laurent Rineau 4ba33e17d3 Run the compiler a second time without -H in case of errors 2018-05-23 15:09:53 +02:00
Laurent Rineau 95edcb3778 Fix compilation error in header-only 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0d4c153da2 Fix ImageInterface UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 9c1c0b027a Fix UI management 2018-05-17 10:20:56 +02:00
Maxime Gimeno 37c52e6bbc WIP SnapShot and SPDX LICENSE update. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0c74a68952 WIP Header_only 2018-05-17 10:20:55 +02:00
Maxime Gimeno c0c7bd095d WIP: Include QGLViewer inside CGAL_qt5 2018-05-17 10:20:55 +02:00
Laurent Rineau d03f76cd78 Remove that annoying warning
When a user-project is compile from a Git repository, there was that
annoying warning about the project not being developed in the same branch
as CGAL itself!
2018-05-15 14:56:22 +02:00
Laurent Rineau c180c0678d Fix LEDA support with gcc 2018-04-26 14:59:24 +02:00
Laurent Rineau ee61c2752c Fix CMake scripts when GMP or MPFR is found under auxiliary/ 2018-04-16 18:21:08 +02:00
Laurent Rineau 17032feff4 Set the CGAL version variables in header-only
Fixes #2820.
2018-04-13 14:58:56 +02:00
Laurent Rineau bd14587987 Fix GMPXX 2018-04-04 10:56:53 +02:00
Laurent Rineau 7bb25993d6 GMPXX: Add CGAL_USE_GMPXX in header-only 2018-04-03 17:31:52 +02:00
Laurent Rineau 1384d24b99 add GMPXX support (work in progress) 2018-04-03 17:22:45 +02:00
Laurent Rineau b262232f49 Remove the warnings from the testsuite
In the testsuite, with `RUNNING_CGAL_AUTO_TEST`, the message will end with:
> Set CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE to TRUE if you want to
> disable this notice.

instead of

> disable this warning.

Because otherwise our test results are full of yellow 'w' (warnings).
2018-03-22 13:11:29 +01:00