Commit Graph

133 Commits

Author SHA1 Message Date
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
Sébastien Loriot fb605cdd39 remove -D that is not compatible with "older" cmake versions 2024-10-22 08:19:49 +02:00
Andreas Fabri 9e75ab340d Use add_compile_definitions 2024-10-09 11:58:52 +01:00
Sébastien Loriot 41b096c91a Merge remote-tracking branch 'cgal/5.6.x-branch' 2024-09-11 17:23:50 +02:00
Sébastien Loriot 4115afa3da Merge remote-tracking branch 'cgal/5.5.x-branch' 2024-09-10 13:51:15 +02:00
Sébastien Loriot 8448129a3a fix conditional compilation 2024-09-09 17:59:24 +02:00
Laurent Rineau 3a223ebd1e cmake_minimum_required(VERSION 3.12...3.29) 2024-06-06 20:19:44 +02:00
Laurent Rineau b05e1e9e46 Remove UseCGAL.cmake
and our old CMake macros `use_lib` and `use_component`.
2023-09-14 17:32:55 +02:00
Laurent Rineau b01da56a56 remove occurrences of OpenGLWidgets in demos' CMake scripts 2023-09-13 17:13:39 +02:00
Laurent Rineau 873c3b26cf remove a few occurrences of "qt5"
There are still a lot!
2023-09-11 17:46:27 +02:00
Laurent Rineau 3a52549c41 more cleanup of CMake scripts for Qt6 2023-08-29 16:35:15 +02:00
Sébastien Loriot 68bc244d02 Merge remote-tracking branch 'cgal/master' into HEAD 2023-08-24 14:14:12 +02:00
Sébastien Loriot 9cdfe70abb Merge remote-tracking branch 'sloriot/CGAL-toward_6.0' 2023-06-15 11:34:09 +02:00
Sébastien Loriot 71b4e4f08f boost::shared_ptr => std::shared_ptr 2023-06-15 10:57:01 +02:00
Laurent Rineau 0576e883f9 Merge branch 'CGAL-fix-Qt5-CMake-GF' into CGAL-Qt6-GF
# Conflicts:
#	AABB_tree/demo/AABB_tree/CMakeLists.txt
#	Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
#	Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
#	Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
#	GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
#	GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
#	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
#	GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
#	GraphicsView/demo/Generator/CMakeLists.txt
#	GraphicsView/demo/GraphicsView/CMakeLists.txt
#	GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
#	GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
#	GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
#	GraphicsView/demo/Polygon/CMakeLists.txt
#	GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
#	GraphicsView/demo/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
#	GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
#	GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
#	GraphicsView/demo/Stream_lines_2/CMakeLists.txt
#	GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h
#	Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt
#	Installation/cmake/modules/CGAL_add_test.cmake
#	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
#	Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt
#	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
#	Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
#	Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
#	Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
#	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
#	Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt
2023-04-28 13:49:58 +02:00
Laurent Rineau fe5a36c08e fix all the CMakeLists.txt for Qt5 2023-04-27 17:27:37 +02:00
Andreas Fabri c6ce5fb120 Switch to QT6 for the GraphicsView demos 2023-04-19 12:19:38 +01:00
Mael Rouxel-Labbé 6f187f332c Misc minor fixes/improvements 2022-09-14 14:08:23 +02:00
Mael Rouxel-Labbé 4fc486b195 Purge CMakeLists.txts from obsolete code / noise 2022-09-06 16:19:11 +02:00
Mael Rouxel-Labbé 7cb21c24b0 Uniformize message() for missing 3rd party libraries
STATUS for non-essential, NOTICE for important stuff
2022-09-06 16:07:31 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Maxime Gimeno a3d1765ab4 Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno 2021-07-19 14:18:40 +02:00
Maxime Gimeno e6c767d5c9 Simplify the GNUC versions tests 2021-05-12 15:45:07 +02:00
Maxime Gimeno 393ae7dae6 Clean-up boost_version reqs 2021-05-12 15:03:53 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Maxime Gimeno cc99fd94ad Demo Pass 2021-02-19 16:02:12 +01:00
Maxime Gimeno 9cd0d450f9 Remove QDomElements and need for QtXml 2021-02-09 11:31:34 +01:00
Sébastien Loriot f4935dc199 Merge branch 'CGAL-Eigen3_support-5.1' 2021-01-15 10:54:02 +01:00
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43:34 +01:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Sebastien Loriot c27e27d8ea
Merge pull request #3853 from afabri/CGAL-cleanup_CMakeLists-GF
CMakeLists.txt: Remove unnecessary include directories
2019-04-29 14:30:13 +02:00
Maxime Gimeno 8860f12b25 Use automoc as much as possible 2019-04-18 16:11:08 +02:00
Maxime GIMENO 41033a80be
Merge branch 'master' into Graphics_view-Fix_demo_IO-GF 2019-04-12 16:10:36 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Maxime Gimeno 422cd589c1 Add missing includes to get BOOST_VERSION and BOOST_GCC 2019-04-03 10:27:55 +02:00
Maxime Gimeno e107612c31 Fix pre processor test 2019-01-10 08:54:49 +01:00
Maxime Gimeno 743569f854 Also disable WKT if gcc version is <4.5 2019-01-09 16:32:08 +01:00
Maxime Gimeno 3b1b6e2401 Merge remote-tracking branch 'cgal/master' into Graphics_view-Fix_demo_IO-GF 2019-01-09 12:35:04 +01:00
Maxime Gimeno d6cfa1a868 Fix CMake warnings about CMP for Visual 2017 2018-11-21 16:17:39 +01:00
Maxime Gimeno 080f63b1b8 Disable WKT for boost < 1.56 2018-11-07 11:58:50 +01:00
Guillaume Damiand ef771d0f97 Re-add include({CGAL_USE_FILE}) is demo with core or image io, and set(CMAKE_INCLUDE_CURRENT_DIR ON) in others. 2018-10-19 09:51:14 +02: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