Commit Graph

58 Commits

Author SHA1 Message Date
Laurent Rineau 8eefb7f173 Merge branch 'master' into pr/lrineau/8273 2025-02-07 16:10:52 +01:00
Laurent Rineau 050677f002 add CMake option CGAL_with_benchmarks 2025-02-06 01:21:42 +01:00
Laurent Rineau e5001d1a50 update our CMake version 3.18...3.31
That will suppress the warnings about `CMP0167` (from CMake 3.30):

```
CMake Warning (dev) at cmake/modules/display-third-party-libs-versions.cmake:37 (find_package):
  Policy CMP0167 is not set: The FindBoost module is removed.  Run "cmake
  --help-policy CMP0167" for policy details.  Use the cmake_policy command to
  set the policy and suppress this warning.
```
2025-02-04 14:32:37 +01:00
Laurent Rineau 3a223ebd1e cmake_minimum_required(VERSION 3.12...3.29) 2024-06-06 20:19:44 +02:00
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 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02: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 a6514fdfad Merge branch 'master' into Scripts-simplify_user_scripts-GF 2019-06-06 10:11:23 +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
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
Sébastien Loriot eb4f860f3b remove mentions of Qt3 2015-10-05 15:19:58 +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
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
Laurent Rineau 97a7727e76 Allow to call "cgal_create_cmake_script demo" on an empty directory 2012-01-18 18:16:12 +00:00
Laurent Rineau 02ef8e35d8 Fix typo 2012-01-18 12:05:43 +00:00
Laurent Rineau cfd37935cf merge from next 2011-10-20 16:04:32 +00:00
Laurent Rineau 4273a5a69e Improvement of cgal_create_cmake_script
This allows to create a CMakeLists.txt in a directory whereas the sources
are in another directory.

This will allow out-of-sources creation of CMakeLists.txt files. And, in
the end, that will improve the branch-build.
2011-10-20 15:49:05 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Sébastien Loriot dff6dda8b3 Remove from copyright holder
Freie Universitaet Berlin (Germany), Martin-Luther-University Halle-Wittenberg
(Germany) and RISC Linz (Austria) as they transfer the copyright to other
sites.
2011-09-21 19:46:31 +00:00
Laurent Rineau 02bca9e9d9 Adapt cgal_create_cmake_script so that it uses the right
cmake_policy(VERSION ...) command.
2011-04-29 14:37:50 +00:00
Laurent Rineau 82f952223e Uniform capitalization in our CMake script: use lowercase for commands 2011-04-28 10:37:38 +00:00
Laurent Rineau ca5c92e034 Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
  - change cmake_minimum_required to VERSION 2.6.2
  - no longer any need for the policy CMP0003 (was for 2.4.x)
  - no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
Fernando Cacciola 69419d9ec1 Add ../include and ../../include in CMakeLists.txt for examples and test 2009-04-27 13:56:16 +00:00
Laurent Rineau 0d3b0c0e8a Fix the indentation. 2008-11-10 11:39:21 +00:00
Laurent Rineau bd5176e8d1 Add NOTICE: where needed, so that the test results scripts can generate a
"r".
2008-11-10 11:12:10 +00:00
Fernando Cacciola 994028ec51 Prefixed CreateSingleSourceCGALProgram.cmake with CGAL_ 2008-11-04 13:09:48 +00:00
Fernando Cacciola 6bae1045df Fixed handling of flags when defined interactively 2008-11-03 21:00:22 +00:00
Laurent Rineau 013c3846df Fix indentation of auto-generated CMakeLists.txt 2008-10-21 08:31:07 +00:00
Laurent Rineau 344fda0669 Fix indentation. 2008-10-08 11:43:42 +00:00
Fernando Cacciola 1ec0942208 Fixed "Core" component name in autogenerated cmake scripts 2008-10-02 18:50:24 +00:00
Laurent Rineau 8ae8e0d132 Fix conditional compilation of auto-generated Qt3-enabled CMakeLists.txt 2008-10-02 11:22:48 +00:00
Laurent Rineau 4b3e9815af Ooops. I forgot that patch!
Followup to revision 45719, which was:
"- Fix soname and soversion of libraries (they were exchanged).
 - Make get_dependency_version found the print_${LIB}_version.cpp, even
   if the lib is compiled separately.
 - Rename FindQt3.cmake to FindQt3-patched.cmake and Qt3Macros to
   Qt3Macros-patched.
 - Make CGAL-Qt3 compilable separately.
 - Fix all commited CMakeLists.txt:
     - use Qt3-patched and Qt3Macros-patched, and s/QT_/QT3_/
     - add a comment about FindQt3-patched,
     - wrap target creation with if(CGAL_FOUND AND QT3_FOUND)/else/endif
 - Modified cgal_create_cmake_script"
2008-09-26 13:03:19 +00:00
Laurent Rineau b52c7a09e9 - Fix soname and soversion of libraries (they were exchanged).
- Make get_dependency_version found the print_${LIB}_version.cpp, even
  if the lib is compiled separately.
- Rename FindQt3.cmake to FindQt3-patched.cmake and Qt3Macros to
  Qt3Macros-patched.
- Make CGAL-Qt3 compilable separately.
- Fix all commited CMakeLists.txt:
    - use Qt3-patched and Qt3Macros-patched, and s/QT_/QT3_/
    - add a comment about FindQt3-patched,
    - wrap target creation with if(CGAL_FOUND AND QT3_FOUND)/else/endif
- Modified cgal_create_cmake_script
2008-09-24 10:32:44 +00:00
Laurent Rineau da490ca698 Partially revert revision 45319. The follwing has been revert:
"Use unique names for example, demo and test targets"
2008-09-05 12:16:37 +00:00
Fernando Cacciola ab07405874 Use unique names for example, demo and test targets
Renamed CGAL-Qt as CGAL-Qt3
Re-spelled cgal components as CORE, ImageIO, PDB, Qt3 and Qt4
2008-09-04 18:58:09 +00:00
Fernando Cacciola ee6fae2991 Added separation in components 2008-09-03 16:55:21 +00:00
Fernando Cacciola 41251065c2 Fix pending problems with examples and demos (now possible to do 'make examples' or 'make demo' from CGAL_DIR) 2008-08-27 16:24:01 +00:00
Fernando Cacciola 9c62ababa9 Add CMAKE_MINIMUM_REQUIRED at the top of each CMakeLists.txt as CMake 2.6 wants 2008-06-29 20:46:44 +00:00
Laurent Rineau d454027d30 Fix the script cgal_create_cmake_script:
- one can use it with 0 or 1 argument.
  - If one argument is used, it *must* be "-q" and nothing else.
2008-06-13 08:44:43 +00:00