Commit Graph

873 Commits

Author SHA1 Message Date
Laurent Rineau e10ace6bcf Merge pull request #4334 from sloriot/CGAL-SPDX_cleanup_fixes
Fix some remaining license notice + add a missing LicenseRef-Commercial
2019-11-06 17:45:23 +01:00
Sébastien Loriot 0d4963f455 also detect BSL 2019-11-04 09:24:22 +01:00
Laurent Rineau 21fedbf0ad Take the version number from `public_release_name` 2019-10-31 18:34:08 +01:00
Sébastien Loriot 9af500c5e5 make the message more verbose 2019-10-28 10:52:28 +01:00
Laurent Rineau 30b02eea63 Merge pull request #4303 from sloriot/CGAL-SPDX_updates
Update SPDX tags
2019-10-25 16:26:13 +02:00
Laurent Rineau 1d6fba5a39 Also create .zip files for -examples and -library tarballs 2019-10-22 18:16:35 +02:00
Laurent Rineau 620d90961d replace tarballs creation by the script feature GENERATE_TARBALLS=ON 2019-10-22 12:50:28 +02:00
Laurent Rineau 30479e5c12 Fix the date in man pages 2019-10-21 18:46:18 +02:00
Sébastien Loriot dfe3ce485d special case for Random Forest 2019-10-20 10:45:13 +02:00
Sébastien Loriot 5dfd8b753f check for the absence of license notice in headers 2019-10-20 01:01:10 +02:00
Sébastien Loriot 8832addb4e update to read SPDX tags (GPL-3+, LGPL 3+, and LGPL3 are enough for us) 2019-10-20 00:36:39 +02:00
Sébastien Loriot 7c63219861 Manual removal of license notice + SPDX updates 2019-10-19 17:14:18 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Laurent Rineau c69c604f1f Merge remote-tracking branch 'refs/remotes/cgal/master' 2019-10-17 21:00:28 +02:00
Sébastien Loriot dd00593e86 add a comment 2019-10-16 23:53:59 +02:00
Laurent Rineau e496a5e679 Merge pull request #4280 from lrineau/CGAL-fix_CGAL_CreateSingleSourceCGALProgram-GF
Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others components

# Conflicts:
#	Scripts/scripts/cgal_create_CMakeLists
2019-10-15 16:33:17 +02:00
Laurent Rineau ac557caa4a Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others 2019-10-10 12:23:42 +02:00
Laurent Rineau 5075a895f7 Merge branch 'releases/CGAL-4.14-branch' 2019-09-06 14:14:29 +02:00
Laurent Rineau 73500e8d3c Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-09-06 14:14:13 +02:00
Sébastien Loriot 4b28db79f0 update script 2019-09-04 16:19:10 +02:00
Maxime Gimeno fe7d83d67e Add a test to replace an empty number of processors by 1 and move --timeout sooner in the options to prevent an eventual other parsing error. 2019-08-13 10:35:35 +02:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Sébastien Loriot 41ef56f8ad Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD 2019-07-18 16:57:27 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Sébastien Loriot 0343659467 add script to ease the update to the new CGAL np 2019-07-14 22:46:46 +02:00
Maxime Gimeno f3697f1b2b Move logging functions in the script to avoid having to ask for CGAL-I before it is set. 2019-07-09 14:17:04 +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 a236d22e2d Merge pull request #3730 from sloriot/CGAL-create_tarballs
Add an option to create tarballs while creating a release
2019-06-20 14:21:16 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +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
Laurent Rineau 021b287fa0 Merge pull request #3912 from lrineau/Scripts-simplify_user_scripts-GF
Simplify user scripts (cgal_create_CMakeLists and cgal_create_cmake_script)
2019-06-17 13:54:36 +02:00
Sébastien Loriot e07ff8846f add a little doc 2019-06-13 14:11:47 +02:00
Sébastien Loriot 453313fae6 script to add label PR merged in a release since the previous release (not a bug-fix release) 2019-06-13 13:54:43 +02:00
Laurent Rineau a6514fdfad Merge branch 'master' into Scripts-simplify_user_scripts-GF 2019-06-06 10:11:23 +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
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +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 9cbfcee84f Merge branch 'master' into CGAL-Exact_algebraic-GF 2019-05-13 18:11:00 +02:00
Laurent Rineau 84ea2f0e96 Use OPTIONAL_COMPONENTS, for Boost 2019-05-13 17:21:58 +02:00
Laurent Rineau 72b56e4156 Remove unneeded whitespace and comments for empty sections 2019-05-07 11:24:24 +02:00
Laurent Rineau 70a7fce1fc Fix the handling of Boost
- only search for Boost if extra Boost components are required,
- do not test `Boost_FOUND` (because Boost is `REQUIRED` in
  `find_package`),
- use Boost imported targets instead of variable (compatibility with
  Boost-1.70 CMake config mode)
2019-05-07 11:23:00 +02:00
Laurent Rineau af16025ce0 CGAL is REQUIRED in find_package: no need to test CGAL_FOUND
As CGAL is `REQUIRED` in `find_package`, no test of `CGAL_FOUND` can
be done, if `CGAL_FOUND` is not `TRUE`, then CMake stops with a hard
error at the line `find_package(CGAL REQUIRED ...)`.
2019-05-07 11:21:12 +02:00
Laurent Rineau e77f3e5d1c Remove support for Qt4 2019-05-07 11:20:01 +02:00
Laurent Rineau 59dd85b953 Fix the usage 2019-05-07 11:18:32 +02:00
Laurent Rineau 4c8709cc60 Remove `ENABLE_CTEST`: it is by default in CGAL 2019-05-07 11:16:21 +02:00
Laurent Rineau 4a0c40b731 Update `cmake_minimum_required` 2019-05-07 11:15:56 +02:00