Commit Graph

1095 Commits

Author SHA1 Message Date
Laurent Rineau 0f59daafb9 Add a hook CGAL_hook_fix_ctest_dependencies
This hook fonction detects dependencies between compilation tests.
2024-01-26 14:56:31 +01:00
Sebastien Loriot 2e4139cbb3
Try to fix link issues with qt6 resources (#7915) 2024-01-19 11:42:11 +01:00
Laurent Rineau 41258bf760 Merge pull request #7963 from sloriot/CGAL-cmake_remove_exec_command
Use execute_process that is recommanded over exec_command since 3.0
2024-01-11 12:45:38 +01:00
Laurent Rineau aeda27f405 "compilation of demo_framework" should be in the Installation package and Polyhedron 2024-01-09 13:58:03 +01:00
Sébastien Loriot f970b9bba4 add option to remove extra newline 2024-01-05 14:08:32 +01:00
Sébastien Loriot 0ab6971ede use execute_process that is recommanded over exec_command since 3.0 2024-01-04 14:30:40 +01:00
Laurent Rineau 811f78c6a1 fix the bug about CGAL_Qt6_moc_and_resources_Fixture 2023-12-07 15:48:09 +01:00
Sébastien Loriot 410ead5f56 also look for Basic viewer in targets 2023-12-06 17:31:02 +01:00
Laurent Rineau 95b83b1214 Merge pull request #7845 from puneetmatharu/patch-cgal-dont-override-build-testing
Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject
2023-11-29 17:22:54 +01:00
Laurent Rineau 2cf5576eb8 Merge pull request #7858 from janetournois/Installation-ITK-jtournois
Installation - fix `CGAL_ITK_support`
2023-11-29 17:18:55 +01:00
Laurent Rineau 1740a2d0d7 Merge pull request #7869 from lrineau/Installation-fix_CMake_REGEXP_REPLACE-GF
CMake: fix incorrect use of string(REGEX REPLACE...)
2023-11-29 17:18:53 +01:00
Laurent Rineau eb59cc6105 Merge remote-tracking branch 'cgal/master' into Installation-ITK-jtournois 2023-11-24 10:50:26 +01:00
Laurent Rineau 9262c6a8b6 Re-add CGAL_ITK_support.cmake
That will allow to be compatible with ITK version 4.13 and 5.x.
2023-11-23 17:25:18 +01:00
Laurent Rineau 25ebbab854 Fix incorrect use of string(REGEX REPLACE...) 2023-11-17 15:29:24 +01:00
Jane Tournois 0b73361226 remove CGAL_ITK_support.cmake
and adapt the CMakeLists that were using it
2023-11-13 12:47:39 +01:00
Laurent Rineau a8b8102567 CGAL_ENABLE_TESTING has three definitions
`CGAL_ENABLE_TESTING` is defined three times:
- once in `/CMakeLists.txt` that is the root of the CMake tree for a Git layout
- once in `Installation/CMakeLists.txt` that is the root of the CMake
  for a release tarball,
- and once in `CGAL_add_test.cmake`, for consumers of `CGALConfig.cmake`.

Two changes:
- Add the default value `${BUILD_TESTING}` to all three definitions
- Modify the comment
2023-11-10 13:17:46 +01:00
Puneet Matharu 7944441068 Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject. 2023-11-02 18:09:03 +00: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 48f37a14dc remove occurrences of Qt5 2023-09-14 17:02:21 +02:00
Laurent Rineau 2f6d51b49b Remove a few occurrences of CGAL_Qt5
... and replace by CGAL_Qt6
2023-09-14 16:33:20 +02:00
Laurent Rineau a12a0fafa9 TBB is a SYSTEM library 2023-08-24 15:29:47 +02:00
Sébastien Loriot 68bc244d02 Merge remote-tracking branch 'cgal/master' into HEAD 2023-08-24 14:14:12 +02:00
albert-github 1cce66c343 Spelling corrections
Spelling corrections `a e...` -> `an e...`
2023-07-30 12:59:17 +02:00
Sébastien Loriot 573de7f29e Merge branch 'master' 2023-06-22 13:38:49 +02:00
Sébastien Loriot cce3dfd075 Merge pull request #7416 from sloriot/CGAL-toward_6.0
CGAL 6.0 requires c++17
2023-06-22 09:28:15 +02:00
Sébastien Loriot bbc4d08ee0 Merge remote-tracking branch 'cgal/master' into HEAD 2023-06-15 10:47:07 +02:00
Sébastien Loriot f5803d5a8b MSVC 2015 is no longer supported 2023-06-15 10:43:16 +02:00
Laurent Rineau 5459870e31 create a new CMake function CGAL_setup_CGAL_flags
That new CMake function will ease the work with the Conan CGAL package.
2023-06-13 14:19:06 +02:00
Laurent Rineau 4cf3095ff5 Merge pull request #7502 from lrineau/Installation-fix_CGALConfig.cmake_for_Conan-GF
fix for Conan 2.0
2023-06-09 16:26:24 +02:00
Laurent Rineau 4d7b71bbb7 Update the patch for Conan 2.0 2023-06-08 17:32:47 +02:00
Laurent Rineau 4f95ee4da6 Merge pull request #7498 from sloriot/fix_libpointmatcher_link
Fix link issue with pointmatcher
2023-06-07 17:34:03 +02:00
Laurent Rineau 16425cc053 Merge pull request #7498 from sloriot/fix_libpointmatcher_link
Fix link issue with pointmatcher
2023-06-07 17:33:39 +02:00
Sébastien Loriot 933fe5004a link with libnabo 2023-06-05 15:46:50 +02:00
Laurent Rineau c31d3e126f Merge pull request #7456 from lrineau/Installation-upgrade_FindTBB.cmake-GF
Upgrade FindTBB.cmake
2023-06-05 15:10:15 +02:00
Laurent Rineau bce4c8398d Merge pull request #7456 from lrineau/Installation-upgrade_FindTBB.cmake-GF
Upgrade FindTBB.cmake
2023-06-05 14:01:28 +02:00
Laurent Rineau c02bd3cbd5 Reintroduce a search in NO_MODULE mode 2023-06-01 10:15:58 +02:00
Laurent Rineau 44a7b6a431 Upgrade FindTBB.cmake
Fixes https://github.com/CGAL/cgal/issues/7349
2023-05-19 18:36:24 +02:00
Laurent Rineau d079559577 Merge pull request #7413 from lrineau/CGAL-fix-Qt5-CMake-GF
Qt5::Svg is now only optional for CGAL_Qt5
2023-05-11 16:55:28 +02:00
Laurent Rineau 15c98093c0 Merge pull request #7411 from lrineau/CGAL-fix_worktree_with_space-GF
CMake: allow spaces in git working directory
2023-05-04 16:37:01 +02:00
Laurent Rineau eaa2c8cd71 Merge branch '5.4.x-branch' into 5.5.x-branch 2023-05-04 16:35:30 +02:00
Sébastien Loriot fcd71fa9f3 CGAL now requires C++17 2023-04-28 20:16:28 +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 1a6ece1cea Qt5::Svg is now only optional for CGAL_Qt5 2023-04-27 17:27:23 +02:00
Laurent Rineau 28da6e7c74 CMake: allow spaces in git working directory 2023-04-26 16:24:01 +02:00
Laurent Rineau b8f23d4feb Merge pull request #7255 from lrineau/CGAL-rename_ctest_test_names-GF
CGAL CTest support: rename the test names
2023-04-24 14:08:27 +02:00
Laurent Rineau 38823ee9c4 Merge pull request #7386 from janetournois/Installation-gmp-jtournois
Installation - add new possible GMP lib name for MSVC
2023-04-21 11:21:21 +02:00
Laurent Rineau 731a774a4f Merge pull request #7386 from janetournois/Installation-gmp-jtournois
Installation - add new possible GMP lib name for MSVC
2023-04-21 11:18:56 +02:00
Laurent Rineau 205236832e Merge remote-tracking branch 'cgal/master' into CGAL-rename_ctest_test_names-GF
# Conflicts:
#	Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt
2023-04-21 10:47:17 +02:00
Andreas Fabri c6ce5fb120 Switch to QT6 for the GraphicsView demos 2023-04-19 12:19:38 +01:00
Andreas Fabri ef46506378 Add cmake/modules files 2023-04-18 16:46:40 +01:00