Commit Graph

3340 Commits

Author SHA1 Message Date
Laurent Rineau cd75eac35a Merge pull request #3486 from efifogel/Ms_2-empty_ouetr_boundary-efif
Fixed face filtering in case one of the summands does not have an out…
2019-01-22 09:15:21 +01:00
Laurent Rineau 026868a294 Merge pull request #3552 from lrineau/Image_IO-Image_3_maybe_not_own_the_data-GF
Add a non-documented API, to allow CGAL::Image 3 not to own its data
2019-01-22 09:15:15 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Andreas Fabri 6b00750ecf Add to CHANGES.md 2019-01-08 09:47:12 +01:00
Laurent Rineau 65a31133fa
Merge branch 'master' into Ms_2-empty_ouetr_boundary-efif 2019-01-07 16:24:42 +01:00
Simon Giraudot 3b246294bf Update CHANGES.md 2019-01-04 14:39:29 +01:00
Laurent Rineau 47cdc92064 Merge pull request #3463 from lrineau/CGAL-Fix_CTest-GF
Fix CTest after #3413
2018-12-19 16:12:29 +01:00
Laurent Rineau 57b2fbdbfb Merge pull request #3485 from afabri/BGL-write_wrl-GF
BGL: Add write_wrl() for FaceGraph
2018-12-19 16:12:26 +01:00
Laurent Rineau 1cb63b5e78 Bump the SONAME 2018-12-17 15:21:59 +01:00
Laurent Rineau f6e83cd23e Move the definition of CGAL_USE_FILE in case of early return() 2018-12-13 10:59:00 +01:00
Laurent Rineau c14fda590d
Merge branch 'master' into CGAL-Fix_CTest-GF 2018-12-10 16:52:33 +01:00
Laurent Rineau 950fd19be6 Merge pull request #3482 from lrineau/Installation-LEDA_remove_ffriend_injection-GF
Try to use LEDA without -ffriend-injection
2018-12-10 14:38:23 +01:00
Andreas Fabri c570e86661 Removed unused typedef; Added to CHANGES.md 2018-11-29 08:12:26 +01:00
Efi Fogel 0ff6b941cb Added a note about a fix to the minkowski_sum_2() function in the 2D Minkowski sum package 2018-11-28 13:06:40 +02:00
Laurent Rineau 81cf49efb1 Fix the construction of CGAL_ROOT in header-only
In header-only, `CGALConfig.cmake` constructs the path to the root of
the CGAL installation. It used to use `../` a lot, to go back in
parent directories, but:
  - that was... ugly,
  - and Ninja saw a problem with that (a warning about the path to
  `print_GMP_version.cpp`).

`CGALConfig.cmake` Now uses the CMake command `get_filename_component`.
2018-11-28 09:46:53 +01:00
Laurent Rineau 263a5715f2 Try to use LEDA without -ffriend-injection 2018-11-26 16:34:12 +01:00
Laurent Rineau c28c0a4b2d Fix a bug with CTest in non-header-only
The pull-request https://github.com/CGAL/cgal/pull/3413 has introduced
a side-effect: CTest was broken when `CGAL_HEADER_ONLY=OFF`, for all
tests using a `.cin` or `.cmd` file. That is due to the variable
`CGAL_CURRENT_SOURCE_DIR` that was only filled by `UseCGAL.cmake`.

Now that we forbid CGAL directories without `CMakeLists.txt`, that
variable `CGAL_CURRENT_SOURCE_DIR` is now useless, and can be removed:
`CMAKE_CURRENT_SOURCE_DIR` is sufficient. That fixes the bug with
CTest, and also makes the CMake code a bit simpler.
2018-11-19 14:33:54 +01:00
Sebastien Loriot 727824eda6
Merge pull request #3325 from efifogel/Aos_2-fixes-efif
Aos 2: fixes
2018-11-14 18:50:12 +01:00
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +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