Commit Graph

294 Commits

Author SHA1 Message Date
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
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
Laurent Rineau 0cdc5b8527 Fix for Boost-1.71 (master branch)
Pass the criteria object by value, instead of const references: same
semantic, but better than the universal reference used by Boost
Parameter 1.71.
2019-05-14 12:36:02 +02:00
Laurent Rineau 6fe9711d78 Remove the check of Boost_VERSION 2019-05-14 11:43:09 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
Update for cpp14
2019-04-08 15:59:28 +02:00
Laurent Rineau 27f10ee7c9 Commited by error.
Partially revert "This branch now targets 4.13.2."

This reverts commit b392643a98, partially.
2019-04-08 12:15:05 +02:00
Laurent Rineau b392643a98 This branch now targets 4.13.2. 2019-04-05 14:50:41 +02:00
Laurent Rineau dcc6d7a58a Fix CGAL::output_to_vtu(..., ASCII) and add tests 2019-04-03 19:03:48 +02:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Laurent Rineau 3b349c7b8f Add examples with Surface_mesh instead of Polyhedron 2019-03-19 13:28:31 +01:00
Maxime Gimeno d6cfa1a868 Fix CMake warnings about CMP for Visual 2017 2018-11-21 16:17:39 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand cd14640d9a Re-add include({CGAL_USE_FILE} ) for mesh 3, to solve link error with image_io. Todo later : solve this problem in the image_io target. 2018-10-17 15:03:55 +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
Laurent Rineau 10a84aa34e Merge branch 'master' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-27 10:33:24 +02:00
Laurent Rineau b86fff3f90 Merge pull request #3128 from sgiraudot/Solver_interface-Warn_against_diagonalize_traits-GF
Solver Interface: deprecate CGAL::Diagonalize_traits
2018-06-27 10:21:37 +02:00
Mael Rouxel-Labbé 7490f34560 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-21 10:15:25 +02:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
2018-06-20 17:21:01 +02:00
Simon Giraudot 95e6d089fa Include Eigen in CMakeLists.txt where needed 2018-06-19 10:57:55 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 340e5d3b5a Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-12 23:29:43 +02:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00
Laurent Rineau c1a9f93a24 Fix a warning (and doc)
Document that the interpolation, in 3D gray images, is always done using
`double` as numerical type.
2018-06-05 10:48:12 +02:00