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

82 Commits

Author SHA1 Message Date
Laurent Rineau 1a544abe4b fix a previous merge conflict resolution 2023-04-14 11:04:09 +02:00
Laurent Rineau feeaa6719c Merge remote-tracking branch 'cgal/master' into CGAL-boost_mp_exact_ring_selector 
# Conflicts:
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
 2023-04-14 11:02:20 +02:00
Sébastien Loriot 84d51db75e do not overwrite existing properties 2023-04-14 10:59:33 +02:00
Laurent Rineau 11ff3c57bd
Merge branch 'master' into CGAL-boost_mp_exact_ring_selector 2023-04-14 09:44:23 +02:00
Sébastien Loriot 7889f8aa6b remove commented line 2023-04-13 09:02:59 +02:00
Sébastien Loriot 089fc821c9 hide a developer friendly way to easily switch with the default exact nt in EPICK/EPECK 2023-04-07 18:41:13 +02:00
Laurent Rineau 89cf5c5547 Fix CMAKE_NO_SYSTEM_FROM_IMPORTED 2023-02-06 10:13:11 +01:00
Laurent Rineau 5c943e558c Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF 
Fix autotest_cgal_with_ctest
 2022-11-25 10:15:07 +01:00
Laurent Rineau ea35fa8f88 Fix autotest_cgal_with_ctest 
That commit makes the CMake variables `CGAL_TEST_SUITE` (the new one)
and `RUNNING_CGAL_AUTO_TEST` (the legacy one) completely equivalent.
 2022-10-05 15:06:02 +02:00
Laurent Rineau a31a7b10eb use `cmake_language(DEFER CALL..)` instead of `variable_watch` 2022-06-21 20:59:18 +02:00
Laurent Rineau be0f802236 Warn only if CGAL_TEST_SUITE is set and CGAL_DATA_DIR is not 2022-06-07 16:34:02 +02:00
Sébastien Loriot 46531b5752 allow for more situations 
using installed CGAL with examples from an archive
(cmake run at example root or per package)
 2022-01-05 17:01:52 +01:00
Sébastien Loriot cd1cdccd62 change the scope of imported targets 2021-11-02 11:01:38 +01:00
Sébastien Loriot 5f750d5bb6 do not define several times 2021-11-01 11:16:40 +01:00
Sébastien Loriot 08b1457649 add CGAL::CGAL_Basic_viewer target 2021-11-01 11:07:55 +01:00
Jane Tournois 8f53cf6c60 swap the search for data and for Data/data 
now, if "Data/data" is found, it does not look for "data",
which, when the system is not case sensitive, is the same as "Data"
 2021-10-15 13:53:19 +02:00
Sébastien Loriot d87f7d7703 use CGAL_ROOT 2021-04-08 09:44:19 +02:00
Guillaume Damiand 751fb3851d
Merge branch 'master' into CGAL_data-gdamiand 2021-03-19 13:47:37 +01:00
Guillaume Damiand d140e5b89d Add CGAL::Data target; link exe with this target in the create_single_source_cgal_program function. 2021-03-19 13:45:04 +01:00
Sébastien Loriot 3cefeeb23c set CGAL_DATA_DIR in CGALconfig.cmake 2021-02-11 19:18:57 +01:00
Maxime Gimeno 3ccd79eec6 Don't check if CGAL_comp is found, it will be done later. 2021-01-20 15:25:55 +01:00
Maxime Gimeno fab8c31662 Keep from using CGLA_Core if CGAL_DISABLE_GMP is ON 2021-01-19 10:15:43 +01:00
Maxime Gimeno 1df239ed11 restore WITH_cgal_lib as it is use din some tests and examples. 2020-10-14 11:57:43 +02:00
Maxime Gimeno 0c14520987 Fix CGAL_Qt5 installation 2020-10-14 11:14:58 +02:00
Maxime Gimeno fcb6419106 WIP CGAL_qt5 2020-10-13 15:36:44 +02:00
Maxime Gimeno 2ed89ef35e simplify CGAL_setup dependencies. 2020-10-12 12:24:13 +02:00
Maxime Gimeno 39f97ca56b remove NOT CGAL_HEADER_ONLY 2020-10-05 15:44:05 +02:00
Maxime Gimeno fa2e8ec0a4 remove WITH_XXX cache options 2020-10-05 15:19:55 +02:00
Laurent Rineau 1ffbd83480 Fix a bug 
```
== CMake setup ==
CMake Warning (dev) at Installation/lib/cmake/CGAL/CGALConfigVersion.cmake:6 (set):
  Cannot set "CGAL_MAJOR_VERSION": current scope has no parent.
Call Stack (most recent call first):
  CGALConfigVersion.cmake:1 (include)
  CMakeLists.txt:13 (include)
This warning is for project developers.  Use -Wno-dev to suppress it.

```
 2020-07-23 18:24:06 +02:00
Laurent Rineau 63b5b30fdf No longer parse CGAL/version.h to get the version numbers 2020-07-21 11:24:09 +02:00
Simon Giraudot b2fe891802 Fix cmake 2020-05-28 08:59:18 +02:00
Jing Yang b495c00450 add include of other modules 2020-05-19 23:42:56 -07:00
Laurent Rineau 0ed0741489 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-05-18 11:59:20 +02:00
Laurent Rineau d85396c148 Make CGAL relocatable again 
It will be relocatable if the user does not change
`CGAL_INSTALL_CMAKE_DIR` from its default.
 2020-05-14 11:10:04 +02:00
Laurent Rineau 47fcaf3d47 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF 
Do not require -DCGAL_HEADER_ONLY
 2019-10-15 16:34:09 +02:00
Laurent Rineau e6510c7b5c Merge pull request #4285 from lrineau/Installation-fix_CMake_scripts_for_installed_header_only-GF 
Fix CMake scripts for installed header-only version of CGAL
 2019-10-15 16:31:30 +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 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 9efbeb3f3b Header-only: remove -isystem in the testsuite or dev-mode 2019-08-14 13:50:19 +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 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
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 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 43cc6b2b2d CGAL_TweakFindBoost must be included before any call to FindBoost 2019-05-06 16:40:50 +02: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