Commit Graph

3319 Commits

Author SHA1 Message Date
Sebastien Loriot 727824eda6
Merge pull request #3325 from efifogel/Aos_2-fixes-efif
Aos 2: fixes
2018-11-14 18:50:12 +01:00
Guillaume Damiand 0c3878694b Include CGAL_Common.cmake, where variable EIGEN3_USE_FILE is defined. 2018-11-06 11:03:59 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Guillaume Damiand ee4f7c5cd9 Resolve conflict 2018-11-02 19:13:25 +01:00
Sébastien Loriot bc073d6670 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2018-11-02 10:57:00 +01:00
Sébastien Loriot 9e9df2c196 Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2018-11-02 10:55:57 +01:00
Sébastien Loriot d940632471 Merge pull request #3258 from MaelRL/PMP-Filter_degenerate_polygon_soup_input-GF
PMP: repair polygon soup
2018-11-02 10:37:58 +01:00
Sébastien Loriot 056c778305 Merge pull request #3370 from maxGimeno/AABB_tree-Change_facegraph_triangle_primitive_id-GF
Aabb_tree: change the id of AABB_face_graph_triangle_primitive and AABB_halfedge_graph_segment_primitive
2018-11-02 10:34:26 +01:00
Sébastien Loriot e925b1aba6 Merge pull request #3225 from maxGimeno/Demo-Remove_polyhedron_item-GF
Polyhedron demo: remove the Scene_polyhedron_item
2018-10-30 15:50:17 +01:00
Maxime Gimeno 50108dc627 Fix wrong policy setting 2018-10-29 14:25:47 +01:00
Laurent Rineau 01eaab049d Fix the logic: search for the TARGET, and not the content of WITH_CGAL... 2018-10-26 16:30:39 +02:00
Guillaume Damiand 9e3f264e2c Add an include CGAL_Common.cmake 2018-10-23 13:44:00 +02:00
Guillaume Damiand 7e022bacf6 Add a debug message, trying to understand where the problem comes from... 2018-10-23 09:09:45 +02:00
Guillaume Damiand d1a027bd2c Github lost my last push git status 2018-10-22 10:39:31 +02:00
Guillaume Damiand 152f34fd56 Change order of things, to be able to do include(CGAL_CreateSingleSourceCGALProgram.cmake) in all cases. 2018-10-22 10:31:06 +02:00
Guillaume Damiand 8f61243a13 Move one include after the definition of CGAL_MODULES_DIR 2018-10-19 10:18:37 +02:00
Laurent Rineau 980d254517 Re-add a missing line 2018-10-19 09:31:32 +02:00
Laurent Rineau 0dd59c1cfd Include CGAL_CreateSingleSourceCGALProgram.cmake in case of early return 2018-10-18 16:25:32 +02:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Efi Fogel 0446b84a8c Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-10-15 12:04:37 +03:00
Sébastien Loriot 9d88ce0826 update changes 2018-10-09 14:15:26 +02:00
Maxime Gimeno aa10bcc5b0 Update changes.md 2018-10-09 14:15:25 +02:00
Sébastien Loriot 3ebf53dc89 update changes 2018-10-09 10:47:51 +02:00
Sébastien Loriot e179770aab add skeleton for collision detection in PMP 2018-10-09 10:28:43 +02:00
Mael Rouxel-Labbé 6ffc97e67d Changed CHANGES.md 2018-10-08 19:43:50 +02:00
Laurent Rineau 5092db81c3 Merge pull request #3201 from kkatrio/repair_functions
PMP: Add more repair functions
2018-10-08 15:13:51 +02:00
Efi Fogel 5afbc4985a Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-10-06 18:36:51 +03:00
Laurent Rineau 0af5004048
Fix typo 2018-10-02 13:22:13 +00:00
Laurent Rineau 7cf19af58f `master` now targets CGAL-4.14 2018-10-01 15:11:49 +02:00
Laurent Rineau 48bb90a36e Polish CGAL-4.13 2018-10-01 10:55:07 +02:00
Laurent Rineau c6fe4b4e66 Merge pull request #3295 from sloriot/Argt-Dual_with_history
Make Dual working with Argt_with_history
2018-09-24 15:27:25 +02:00
Laurent Rineau f29919a03a Move the changes into the section CGAL-4.14
and add backquotes for class or header names.
2018-09-19 11:48:30 +02:00
Mael Rouxel-Labbé 1676cd7405 Merge branch 'repair_functions-old' into repair_functions 2018-09-17 15:10:39 +02:00
Laurent Rineau f8a37e59ef Fix issue #3317 by removing the unused module FindGLEW.cmake 2018-09-17 14:41:54 +02:00
Laurent Rineau 146fc90a33 This branch now targets a possible CGAL-4.12.2. 2018-09-17 11:43:31 +02:00
Simone Gasparini 3d38afce97
[doc] fix nested bullet list in INSTALL.md
Only * - + are allowed for bullet lists
2018-09-15 13:48:46 +02:00
Laurent Rineau ac173dfe44 Prepare CGAL-4.13 2018-09-12 11:07:03 +02:00
Efi Fogel a15560a7b1 Updated the release notes for 2D Arrangements for 4.13. 2018-09-10 22:12:51 +03:00
Efi Fogel c1b19fa355 Updated changes for 2D Arrangements 2018-09-09 16:56:23 +03:00
Efi Fogel 7f66adc81a Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-09-09 14:26:56 +03:00
Efi Fogel 41978f8d54 Updated changes for 2D Arrangements 2018-09-09 09:36:47 +03:00
Mael Rouxel-Labbé d1f969ec86 Changed CHANGES.md 2018-08-28 12:05:26 +02:00
Laurent Rineau 17fc9631cf Prepare CGAL-4.13-beta2, if needed 2018-08-01 16:22:31 +02:00
Laurent Rineau f1e926e689 Update <CGAL/version.h> (for full header-only) 2018-07-31 16:26:54 +02:00
Laurent Rineau f1ebda2ef7 Reorder the sections 2018-07-31 16:22:23 +02:00
Laurent Rineau 9f5b89e33d Rewrap the CHANGES.md 2018-07-31 16:03:25 +02:00
Sébastien Loriot d05df530b3 Merge pull request #2658 from MaelRL/Periodic_3_mesh_3-Feature-MBogdanov
Periodic_3_mesh_3, new package
2018-07-25 18:55:12 +02:00
Sebastien Loriot 327f7d8fbd
Merge branch 'master' into convex_hull_function 2018-07-19 10:21:26 +02:00
Laurent Rineau e8850746f4
Merge pull request #3226 from maxGimeno/Convex_hull_3-Make_minimal_hull-GF
Convex_hull_3: Make it minimal.
2018-07-18 18:48:26 +02:00
Mael Rouxel-Labbé 758104c189 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-07-18 17:42:23 +02:00