Commit Graph

137 Commits

Author SHA1 Message Date
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
Laurent Rineau c5d01fc96e This branch now targets a possible 5.4-beta2 2021-12-17 17:41:29 +01:00
Laurent Rineau 2010a410e2 Prepare CGAL-5.4-beta1 2021-12-14 15:35:03 +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 f153a1ed3e Merge remote-tracking branch 'cgal/master' into HEAD 2021-07-22 13:15:22 +02:00
Laurent Rineau 6de515bedc master targets CGAL-5.4-dev 2021-07-06 14:57:08 +02:00
Laurent Rineau 469d8afd5c Next release in this branch will be 5.3.1 2021-07-06 14:53:04 +02:00
Laurent Rineau 484ee4c6c4 Change the release name, from 5.3-beta2 to 5.3
...and prepare for the near publication of 5.1.5 and 5.2.3.
2021-07-02 12:46:43 +02:00
Laurent Rineau 3dce682668 CGAL-5.3-beta1 was released 2021-06-11 09:58:18 +02:00
Laurent Rineau 6f2ab97ced Prepare 5.3-beta1 2021-06-02 12:13:38 +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 2255f8e8ea Merge remote-tracking branch 'cgal/master' into CMake-modernization-maxGimeno 2021-01-13 14:34:09 +01:00
Laurent Rineau 58af499996 master now targets CGAL-5.3-dev 2020-11-20 21:34:18 +01:00
Laurent Rineau a60a9e638d Next release will be 5.2-beta2 2020-11-18 20:30:18 +01:00
Laurent Rineau 1d9bebc673 Prepare CGAL-5.2-beta1 2020-11-13 16:37:15 +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 80168d85b2 Next release on master will be 5.2-dev 2020-09-08 16:44:17 +02:00
Laurent Rineau b271ec54df Preparations for CGAL-5.1. 2020-09-04 15:18:51 +02:00
Laurent Rineau a8ed7408c3 Prepare for a beta3 and let's hope it will not be needed 2020-07-28 11:24:19 +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 23f8f46b31 Fix for the tests in test/Installation/CMakeLists.txt 2020-07-21 18:05:01 +02:00
Laurent Rineau ed377100ee Read CGAL_BUILD_VERSION from another file
That allows the release creation script to fill that number.
2020-07-21 11:57:12 +02:00
Laurent Rineau 63b5b30fdf No longer parse CGAL/version.h to get the version numbers 2020-07-21 11:24:09 +02:00
Laurent Rineau ec6c0d6758 Prepare for 5.1-beta2 2020-06-09 22:15:45 +02:00
Laurent Rineau 9b8ecd720b Merge pull request #4636 from sgiraudot/CMake-Third_party_imported_targets-GF
CMake: Use Imported Targets for 3rd Party Libs
2020-06-05 17:54:14 +02:00
Laurent Rineau daf86cc719 Prepare for 5.1-beta1 2020-06-04 09:42:02 +02:00
Simon Giraudot b2fe891802 Fix cmake 2020-05-28 08:59:18 +02:00
Laurent Rineau b70dcffbd7 Merge pull request #4697 from lrineau/Installation-add_CGALConfigVersion-GF
header-only mode: add CGALConfigVersion.cmake
2020-05-22 16:39:28 +02:00
Jing Yang b495c00450 add include of other modules 2020-05-19 23:42:56 -07:00
Laurent Rineau 81c1b96217 Merge branch 'releases/CGAL-5.0-branch' 2020-05-18 12:01:39 +02: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 252b58d39f Change the version compatibility to SameMajorVersion
and change the testsuite
2020-05-14 11:26:00 +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 abf414df81 Change create_new_release to use CGALConfigVersion.cmake as input 2020-05-06 13:36:38 +02:00
Laurent Rineau f4581c2b13 Add CGALConfigVersion.cmake, and CTest tests 2020-05-01 15:00:35 +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