Commit Graph

160 Commits

Author SHA1 Message Date
Sébastien Loriot c4b7c524dd fix indentation 2022-10-25 16:55:17 +02:00
Laurent Rineau 4c5b5843e3 sed -i -e 's/egrep/grep -E/g' 2022-07-01 16:19:36 +02:00
Laurent Rineau 734c96e951 Merge branch 'master' into pr/lrineau/6558 2022-05-06 16:25:32 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Sébastien Loriot 8e0ed828e7 remove mentions to CMAKE_GENERATOR in test scripts 2022-04-28 13:48:23 +02:00
Laurent Rineau 21755b1123 Merge pull request #5245 from GilesBathgate/create-assertions-fix
Allow -DNDEBUG and CGAL_nnn_assertions at the same time
2021-03-24 15:05:41 +01:00
Giles Bathgate 5a36ff89b5 Drop NDEBUG it is already visible through CGAL_NO_ASSERTIONS 2020-12-04 19:42:21 +00:00
Maxime Gimeno 8eb02bd7aa update scripts 2020-10-14 11:38:31 +02:00
Maxime Gimeno 24390666eb remove qt4 traces in scripts 2020-10-14 11:31:40 +02:00
Laurent Rineau 6cdd833e13 Merge branch 'DT_3-issue4388__for_CGAL-4.14.2-GF' into DT_3-issue4388-GF 2019-12-04 15:39:55 +01:00
Laurent Rineau 6ded244449 Merge branch 'DT_3-issue4388__for_CGAL-4.13.2-GF' into DT_3-issue4388__for_CGAL-4.14.2-GF 2019-12-04 15:32:07 +01:00
Laurent Rineau 12181210e8 Add a bench of DT3 with TBB and Google benchmark 2019-12-04 15:16:25 +01:00
Sébastien Loriot 7c63219861 Manual removal of license notice + SPDX updates 2019-10-19 17:14:18 +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 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 a6514fdfad Merge branch 'master' into Scripts-simplify_user_scripts-GF 2019-06-06 10:11:23 +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 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
Laurent Rineau dc96a7ecbd Upgrade `cmake_minimum_required` 2019-05-07 11:15:25 +02:00
Laurent Rineau 3c2ca27da8 Fix `$TYPE` 2019-05-07 11:15:09 +02:00
Laurent Rineau 96ee94eb05 Remove `if ( CGAL_FOUND )`: CGAL is `REQUIRED` in `find_package` 2019-05-07 11:14:09 +02:00
Laurent Rineau 0ade3a5576 Remove `set(CMAKE_CXX_STANDARD 14)`: it's the default with CGAL-5.0 2019-05-07 11:13:21 +02:00
Laurent Rineau d4e09c1d78 Modernize the CMakeLists.txt that use LEDA
The file `${CGAL_USE_FILE}` must be included before
`find_package(LEDA)` can be called. But that would require to verify
`CGAL_FOUND` first...

Actually, now that we require at least CMake 3.1, let's say that CGAL
is `REQUIRED`, but not the components. That is the basic truth, and
that avoids testing for `CGAL_FOUND`.

At the same time, I have modified the `cmake_minimum_required`:
  - placed as the first line,
  - set to `3.1...3.13`:
      https://cmake.org/cmake/help/latest/command/cmake_policy.html#setting-policies-by-cmake-version

I have also removed the comments that says the `CMakeLists.txt` was
generated. That may have been true... but before a lot of modifications.
2019-03-27 09:56:16 +01:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Sébastien Loriot a89ccb10e7 remove non UTF-8 characters 2017-01-19 15:20:26 +01:00
Laurent Rineau 2cc5afd7b6 Enable C++14 by default in generated CMake scripts
(cherry picked from commit b11818e8d67dd741ac411bc02e108ddd9a290fd3)
2016-09-30 18:21:58 +02:00
Laurent Rineau 545e80f18e Add a variable CGAL_CURRENT_SOURCE_DIR
Save the current source directory to `CGAL_CURRENT_SOURCE_DIR`. The
variable value is modified by a `CMakeLists.txt` file when it is
generated by `cgal_create_cmake_script` in the binary tree. The script
`cgal_create_cmake_script` itself it called by CMake, by the function
`process_CGAL_subdirectory` (see its definition in
`Installation/cmake/modules/CGAL_Macros.cmake`), called in
`(examples|test|demo)/CMakeLists.txt`.

Eventually, that variable value is supposed to be the directory to the
current sources, even if the current `CMakeLists.txt` is within the
binary tree.

That is used in `CGAL_CreateSingleSourceCGALProgram.cmake` for the CTest
support, so set correctly the current working directory (in the
directory of the tests/examples).
2016-09-20 10:53:20 +02:00
Philipp Möller 2edc292f7e Drop -p option
The required code is no longer supported after the removal of
CGAL_ALLOW_ALL_PRECONFIGURED_LIBS_COMPONENT
2016-02-16 17:25:19 +01:00
Sébastien Loriot eb4f860f3b remove mentions of Qt3 2015-10-05 15:19:58 +02:00
Laurent Rineau 6506a35e7f It is CMake 2.8.11 that we want. 2015-07-13 12:21:54 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
Alexander Kobel 8ae9c144a8 make cgal_create_CMakeLists and its brethren recognize all common C++ source file extensions
Rationale: cgal_create_CMakeLists and related scripts used to not
consider files ending on anything else than .cpp or .C as C++ sources.
This patch allows for the list of extensions considered as C++ source
files as stated in the g++ man page.
2015-06-25 15:55:55 +02:00
Sébastien Loriot 6ed1ba826e Merge branch 'to-be-tested/Stop_testing_taucs-sloriot'
Taucs, Lapack and Blas supports are no longer tested

Approved by the Release Manager
Tested in CGAL-4.5-Ic-97

Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
2014-07-16 20:19:21 +02:00
Laurent Rineau 37fdf5a4e9 Typo 2014-06-27 14:54:43 +02:00
Sébastien Loriot aeb094e4cc more Taucs removal 2014-06-25 15:58:37 +02:00
Laurent Rineau 27b73b067d Output to stdout, for consistency with the other outputs 2013-09-03 17:25:33 +02:00
Laurent Rineau 73ad12ef1f cgal_create_cmake_script now displays created targets on stderr 2013-08-30 13:34:44 +02:00
Eric Berberich 357d6258f5 cmake's link_libraries is deprecated
removed almost all occurenced (missing UseFiles). While
doing so, some CMakeLists.txt could also be simplified. In fact
many more CMakeLists.txt can be simplified, in one of two ways:
1) add external libs to CGAL_3RD_PARTY_LIBRARIES and
2) call cgal_create_single_source_program
2012-08-03 22:32:39 +00:00
Eric Berberich 4cc4796227 correct name of ImageIO 2012-08-03 17:50:11 +00:00
Eric Berberich 7df5cae640 moved 2012-05-24 12:36:17 +00:00
Eric Berberich 530dc3ade2 better name 2012-05-24 12:35:31 +00:00