Commit Graph

315 Commits

Author SHA1 Message Date
Maxime Gimeno 499301c759 More fixes 2021-08-31 16:00:37 +02:00
Maxime Gimeno ab182dd46a Merge remote-tracking branch 'cgal/master' into CGAL-Clang_tidy_new_pass-maxGimeno 2021-05-21 14:04:07 +02:00
Maxime Gimeno 413b711ee2 Example pass 2021-05-20 15:07:40 +02:00
Sébastien Loriot 22be8671f7 move read_vtk_image_data to IO 2021-05-04 14:59:28 +02:00
Sébastien Loriot 70058db9b7 add IO namespace for Mesh_3 package 2021-05-03 15:39:07 +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
Laurent Rineau 53491eca02 Merge pull request #5550 from maxGimeno/Eigen_fixes_in_cmakelists-5-2-maxGimeno
Fix Eigen in CMakeLists 5.2
2021-04-06 15:12:58 +02:00
Maxime Gimeno 5aa763e055 Don't indent and use return() 2021-03-23 14:57:15 +01:00
Maxime Gimeno 12cf238ca2 Don't REQUIRE Eigen 2021-03-23 13:49:55 +01:00
Maxime Gimeno 9f1e0cb8d6 Fix Eigen in cmakelists 2021-03-23 13:05:52 +01:00
Jane Tournois 04e7d8281d link with TBB 2021-03-04 12:08:45 +01:00
Jane Tournois cc589cdc7f
fix example name
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-02-19 10:18:19 +01:00
Jane Tournois 032ad19677 add custom initialization of gray image to user manual
and re-organize to have both custom initializations (gray level and
segmented) together
2021-02-15 16:27:40 +01:00
Jane Tournois 4902b42f54 add example to mesh gray image with custom initialization 2021-02-12 16:56:33 +01:00
Laurent Rineau 1453294c74 Merge pull request #5376 from lrineau/Mesh_3-fix_mesh_implicit_domains.cpp-GF
Fix examples/Mesh_3/mesh_implicit_domains.cpp
2021-02-05 16:10:24 +01:00
Laurent Rineau 3d71b8e5f0 Merge pull request #5376 from lrineau/Mesh_3-fix_mesh_implicit_domains.cpp-GF
Fix examples/Mesh_3/mesh_implicit_domains.cpp
2021-02-05 16:07:22 +01:00
Laurent Rineau ac875956a1 Fix examples/Mesh_3/mesh_implicit_domains.cpp
The error was actually due to an mismatch between `CGAL_LINKED_WITH_TBB`
and `CGAL_CONCURRENT_MESH_3`.

For CGAL-5.3 we should clean that up! That code using `Parallel_tag`
without TBB should not compile, actually.

Fix for https://github.com/CGAL/cgal/issues/5375
2021-01-20 15:38:05 +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 bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Sebastien Loriot 9e4970faef
Merge pull request #4781 from lrineau/Mesh_3-ITT_support-GF
Add ITT support in Mesh_3
2020-10-02 15:20:04 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Laurent Rineau 95687acb0f Merge branch 'Mesh_3-fix_examples_CMakeLists_with_TBB-GF' into Mesh_3-fix_examples_CMakeLists_with_TBB-GF--for_master 2020-07-09 13:58:41 +02:00
Laurent Rineau 9bf27c6763 Fix the link with TBB 2020-07-09 13:24:08 +02:00
Laurent Rineau ae40fec6a3 Missing target 2020-07-09 13:23:55 +02:00
Laurent Rineau 49f2d04d68 Sort target names 2020-07-09 13:22:37 +02:00
Laurent Rineau 2e912d4cb2 Merge branch 'master' into Mesh_3-ITT_support-GF 2020-07-08 16:22:58 +02:00
Maxime Gimeno f221f4ba4a Try to add CGAL::CGAL_Image_IO to the linked target to fix LINK error on MSVC 2019 2020-06-19 15:53:50 +02:00
Maxime Gimeno 49e66c4ddf Add missing target 2020-06-15 13:08:28 +02:00
Laurent Rineau d263a63925 Refresh examples/Mesh_3/CMakeLists.txt
... and remove the use of the variable `WITH_CGAL_ImageIO`.
2020-06-12 20:43:42 +02:00
Laurent Rineau 25710329ac Add ITT support in Mesh_3 2020-06-11 14:56:04 +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
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Simon Giraudot 66ebb5a7d6 Fix missing Eigen dep in targets 2020-02-10 11:57:57 +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 2a5b7cd7ba Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF
Fix CTest on windows
2019-09-05 14:59:38 +02:00
Laurent Rineau dc93527270 Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF
Fix CTest on windows
2019-09-05 14:56:25 +02:00
Laurent Rineau 94d654b9ab Fill CGAL_EXECUTABLE_TARGETS wherever that was missing 2019-09-04 14:19:54 +02:00
Sébastien Loriot aa339ce63d Merge 'cgal/releases/CGAL-4.14-branch' 2019-08-29 07:37:03 +02:00
Laurent Rineau 4ab183acd9 Fix the miscompilation when TBB is not used
fixup! Fix the miscompilation when TBB is not used
2019-08-19 16:18:50 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau 1d5b626436 Fix the CMake warning 2019-07-01 09:32:12 +02:00
Laurent Rineau 4435f93aaa Compatibility with VTK 9 (VTK master)
Fix issue #3789
2019-06-26 13:17:14 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Laurent Rineau 3a9b2fe67f Merge branch 'releases/CGAL-4.14-branch' 2019-05-21 16:36:28 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00