Commit Graph

143 Commits

Author SHA1 Message Date
Sébastien Loriot 4b9ca293c7 main will now target 6.2 2025-08-04 10:20:25 +02:00
Laurent Rineau 0435766dcf next on `master` will be CGAL-6.1-beta2, if needed 2025-07-09 13:07:03 +02:00
Laurent Rineau b2f6f03d3f update CGAL version to 6.1-beta1 2025-07-01 17:16:44 +02:00
Laurent Rineau 010adccdec fix the mentions of CGAL_USE_BASIC_VIEWER_QT (with the Qt suffix) 2025-05-02 09:22:38 +02:00
Guillaume Damiand 807806b1db add alias target to keep old name CGAL::CGAL_Basic_viewer. 2025-04-25 17:19:05 +02:00
Guillaume Damiand b9efd6983c replace macro CGAL_USE_BASIC_VIEWER by CGAL_USE_BASIC_VIEWER_QT 2025-04-17 17:45:10 +02:00
Guillaume Damiand 219ea871d7 copy the parts of gsoc2024-basic_viewer_glfw-tgrillon that concern only the qt basic viewer 2025-04-17 15:55:54 +02:00
Sébastien Loriot db4404f0cc Merge remote-tracking branch 'cgal/6.0.x-branch' 2024-11-08 16:18:00 +01:00
Laurent Rineau 0d76bb4612 remove QT_NO_KEYWORDS from CGAL::CGAL_Basic_viewer 2024-11-08 16:16:28 +01:00
Laurent Rineau 8469e92013 this branch will now target 6.0.2 2024-10-22 12:35:12 +02:00
Laurent Rineau 096075ecfc master will now target 6.1 2024-10-21 17:45:41 +02:00
Laurent Rineau 30e1848c0a this branch will now target 6.0.1 2024-09-27 18:16:36 +02:00
Laurent Rineau ef77c4a6ff Prepare CGAL-6.0 2024-09-25 16:18:42 +02:00
Laurent Rineau 78a4865416 prepare for 6.0-beta2 2024-06-21 18:44:43 +02:00
albert-github 36c8b7589d Spelling corrections
Last batch (for now) of spelling corrections in doxygen and normal comments
2024-05-31 19:05:34 +02:00
Sebastien Loriot 132b932061
Prepare CGAL 6.0-beta1 (#8224) 2024-05-26 17:51:19 +02:00
Laurent Rineau c9ca4fdc6a update versions for CGAL-6.0-beta1 2024-05-24 17:46:35 +02:00
Laurent Rineau bc62b53b38 Fix issue #8192 2024-05-23 18:41:04 +02:00
Sébastien Loriot 24015ce3a7 fix conditional compilation of programs using CORE 2024-03-14 11:30:14 +01:00
Sébastien Loriot 44b7ec6f3a improve detection of cases when Core can be used 2024-03-14 11:11:18 +01:00
Laurent Rineau fe68498e95 CGALConfig.cmake remove the early return()
Otherwise we have a lot of warnings like:
```
CMake Warning at /usr/lib64/cmake/Qt6/QtPublicWalkLibsHelpers.cmake:284 (message):
  When trying to collect dependencies of target
  'Constrained_Delaunay_triangulation_2', the non-existent target 'Qt6::Svg'
  was encountered.  This can likely be fixed by moving the find_package call
  that pulls in 'Qt6::Svg' to the scope of directory
  '/home/lrineau/Git/cgal-testsuite-dockerfiles/testsuite/CGAL-6.0-Ic-66/test/Triangulation_2_Demo'
  or higher.  This warning can be silenced by setting
  QT_SILENCE_MISSING_DEPENDENCY_TARGET_WARNING to ON.
Call Stack (most recent call first):
  /usr/lib64/cmake/Qt6/QtPublicWalkLibsHelpers.cmake:320 (__qt_internal_print_missing_dependency_target_warning)
  /usr/lib64/cmake/Qt6Core/Qt6CoreMacros.cmake:609 (__qt_internal_collect_all_target_dependencies)
  /usr/lib64/cmake/Qt6Core/Qt6CoreMacros.cmake:709 (_qt_internal_finalize_executable)
  /usr/lib64/cmake/Qt6Core/Qt6CoreMacros.cmake:564:EVAL:1 (qt6_finalize_target)
  test/Triangulation_2_Demo/CMakeLists.txt:DEFERRED
```

The issue was that `find_package(Qt6) ...` is required in any
sub-directory, because imported targets like `Qt6::Svg` are
local to the directory scope.
2023-09-19 15:02:31 +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 9f68b1a0be TBB is a SYSTEM library, and CGAL::CGAL is not 2023-08-24 16:48:22 +02:00
Sébastien Loriot 573de7f29e Merge branch 'master' 2023-06-22 13:38:49 +02:00
Laurent Rineau 12cc83e7d5 prepare the creation of 5.6-beta2 and 6.0-dev 2023-06-13 13:33:51 +02:00
Sébastien Loriot 29b84248f8 missing 6.0 updates
# Conflicts:
#	Documentation/doc/resources/1.8.20/menu_version.js
#	Documentation/doc/resources/1.8.4/menu_version.js
#	Documentation/doc/resources/1.9.3/menu_version.js
2023-06-13 12:50:04 +02:00
Andreas Fabri c6ce5fb120 Switch to QT6 for the GraphicsView demos 2023-04-19 12:19:38 +01:00
Laurent Rineau 1a544abe4b fix a previous merge conflict resolution 2023-04-14 11:04:09 +02:00
Laurent Rineau feeaa6719c Merge remote-tracking branch 'cgal/master' into CGAL-boost_mp_exact_ring_selector
# Conflicts:
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
2023-04-14 11:02:20 +02:00
Sébastien Loriot 84d51db75e do not overwrite existing properties 2023-04-14 10:59:33 +02:00
Laurent Rineau 11ff3c57bd
Merge branch 'master' into CGAL-boost_mp_exact_ring_selector 2023-04-14 09:44:23 +02:00
Sébastien Loriot 7889f8aa6b remove commented line 2023-04-13 09:02:59 +02:00
Sébastien Loriot 089fc821c9 hide a developer friendly way to easily switch with the default exact nt in EPICK/EPECK 2023-04-07 18:41:13 +02:00
Laurent Rineau bc919403d4 Preparation for CGAL-5.6-beta1 2023-04-06 11:48:17 +02:00
Laurent Rineau 89cf5c5547 Fix CMAKE_NO_SYSTEM_FROM_IMPORTED 2023-02-06 10:13:11 +01:00
Laurent Rineau 5c943e558c Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
Fix autotest_cgal_with_ctest
2022-11-25 10:15:07 +01:00
Laurent Rineau ea35fa8f88 Fix autotest_cgal_with_ctest
That commit makes the CMake variables `CGAL_TEST_SUITE` (the new one)
and `RUNNING_CGAL_AUTO_TEST` (the legacy one) completely equivalent.
2022-10-05 15:06:02 +02:00
Laurent Rineau fc3e764448 Next release in this branch: 5.4.3 2022-07-15 16:17:30 +02:00
Laurent Rineau a31a7b10eb use `cmake_language(DEFER CALL..)` instead of `variable_watch` 2022-06-21 20:59:18 +02:00
Laurent Rineau e5f1bae4ba Merge pull request #6649 from lrineau/fix_issue_6647
CGALConfig.cmake: Warn only if CGAL_TEST_SUITE is set and CGAL_DATA_DIR is not
2022-06-10 16:45:31 +02:00
Laurent Rineau be0f802236 Warn only if CGAL_TEST_SUITE is set and CGAL_DATA_DIR is not 2022-06-07 16:34:02 +02:00
Laurent Rineau 54a992ff9f Thie branch targets 5.4.2 2022-06-07 13:00:45 +02:00
Laurent Rineau 87cdfe6694 master will now target 5.6 2022-06-06 16:29:00 +02:00
Laurent Rineau a47790f1d5 Version files for 5.5-beta1 2022-05-19 16:54:36 +02:00
Laurent Rineau 47aab15a17 Next version in this branch will be 5.4.1 2022-01-31 17:26:46 +01:00
Laurent Rineau c58ac97e93 Prepare 5.4.x-branch for the release of version 5.4 2022-01-27 12:12:21 +01:00
Laurent Rineau f558b8aa3c `master` is now for CGAL-5.5 2022-01-17 10:08:04 +01:00
Sébastien Loriot 46531b5752 allow for more situations
using installed CGAL with examples from an archive
(cmake run at example root or per package)
2022-01-05 17:01:52 +01:00
Laurent Rineau c5d01fc96e This branch now targets a possible 5.4-beta2 2021-12-17 17:41:29 +01:00
Laurent Rineau 2010a410e2 Prepare CGAL-5.4-beta1 2021-12-14 15:35:03 +01:00