Commit Graph

3376 Commits

Author SHA1 Message Date
Maxime Gimeno ca4f5e12ed Merge remote-tracking branch 'cgal/master' into Periodic_4_hyperbolic_triangulation_2-IIordanov 2019-02-12 15:58:49 +01:00
Laurent Rineau 9a03d47cb0 Merge pull request #3297 from maxGimeno/Stream_support-Dont_use_vtk_for_vtu-GF
Stream support: VTP and VTU writing functions
2019-02-07 13:31:23 +01:00
Laurent Rineau 1a45e1c753 Merge pull request #3535 from sgiraudot/Classification-Neural_network_and_parallelized_random_forest-GF
[Small Feature] Classification: Neural Network and parallelized Random Forest
2019-02-07 13:31:20 +01:00
Laurent Rineau 0ca486665a Merge pull request #3654 from maxGimeno/Triangulation_fix_tests_for_clang-GF
Triangulation: Fix the tests for GCC<4.4 so it wont match clang.
2019-02-07 13:30:46 +01:00
Laurent Rineau 27f1dc4a62 Do no always search for GMPXX
There is a kind of bug in `UseCGAL.cmake`, that enables GMPXX if it is
found, even if `WITH_GMPXX` is `OFF`. If GMPXX is never search for,
that should avoid it to be accidentally activated on platforms we do
not want it.
2019-02-07 10:12:51 +01:00
Laurent Rineau 02690350ee Replace include(CTest) by minimal usage
- Define the option `BUILD_TESTING`
- Call to `enable_testing()` if `BUILD_TESTING` is on.
2019-02-04 15:30:24 +01:00
Laurent Rineau f37ac9cfc6 Fix non-header-only CGALConfig.cmake as regards to CGAL_Core
... and then fix the `CMakeLists.txt` of HDT2_demo.
2019-02-04 15:09:07 +01:00
Maxime Gimeno de8dde79f4 Replace not by ! in preprocessor directives 2019-02-04 10:40:00 +01:00
Laurent Rineau c9164a0660
Merge branch 'master' into Stream_support-Dont_use_vtk_for_vtu-GF 2019-01-22 12:06:08 +01:00
Maxime Gimeno 549568a954 Fix conflicts 2019-01-22 10:08:48 +01:00
Laurent Rineau f5a8686cf3 Merge pull request #3439 from aboudev/VSA-lingjie
New package: Surface_mesh_approximation
2019-01-22 09:17:35 +01:00
Laurent Rineau 0c1517d97e Merge pull request #3446 from sloriot/Installation-extra_slash
Clean-up include dir in CGALconfig.cmake
2019-01-22 09:15:24 +01:00
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 d52718f312 Fix Conflicts 2019-01-21 10:03:31 +01:00
Laurent Rineau 11db055bfe Modify CHANGES.md
Split the changes into two different paragraphs (2D/3D meshes, and
BGL).
2019-01-17 16:03:48 +01:00
Laurent Rineau 1754057d24 My changes to write_vtu 2019-01-16 16:50:45 +01:00
Laurent Rineau 40cf3869ba My changes for write_vtp 2019-01-16 16:15:01 +01:00
Maxime Gimeno cb10422e3c Fix indentation and markdown 2019-01-16 10:44:30 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Simon Giraudot dc9d52f485 Update filename in whitelisted headers 2019-01-10 11:08:56 +01:00
Laurent Rineau c9fb876574
Merge branch 'master' into VSA-lingjie 2019-01-10 10:13:09 +01:00
Maxime Gimeno 1006be85bd Fix Conflicts 2019-01-09 12:29:20 +01:00
Iordan Iordanov 59b212968e Added new packages to CHAMGES.md 2019-01-08 17:43:20 +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 e5c2d12ce3 Merge branch 'Classification-Neural_network_and_parallelized_random_forest-GF-old' into Classification-Neural_network_and_parallelized_random_forest-GF 2019-01-07 11:54:41 +01:00
Simon Giraudot c81fbe4688 Move all classifiers based on other libraries to dedicated namespaces 2019-01-07 11:50:02 +01:00
Simon Giraudot 3b246294bf Update CHANGES.md 2019-01-04 14:39:29 +01:00
Sébastien Loriot 0ec2fa5136 update changes 2018-12-21 13:14:23 +01:00
Simon Giraudot 3cc1b995be Merge remote-tracking branch 'mine/Classification-Neural_network_and_parallelized_random_forest-GF' into Classification-Neural_network_and_parallelized_random_forest-GF 2018-12-21 10:31:00 +01:00
Mael Rouxel-Labbé 15fe22cc6d Micro fix to gpl.h.in and added licenses for HT_2 and P4HT_2
(re-generated all the licenses on the way)
2018-12-19 18:38:05 +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
Simon Giraudot 847a6d8a8f Add TensorFlow_neural_network_classifier to whitelisted headers 2018-12-14 10:22:11 +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
Simon Giraudot 3b0220482a Update CHANGES.md 2018-12-12 10:06:33 +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
Simon Giraudot f520f9eb11 First version of NN with TensorFlow 2018-12-06 14:59:57 +01:00
Lingjie Zhu 73c2a418c6 fix SPDX license indentifier 2018-11-30 10:45:24 +01:00
Lingjie Zhu a4ef69a631 add package license 2018-11-30 15:24:16 +08: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
Maxime Gimeno 7b13f4a969 Add misisng license header, rename vtu functions and update change.md 2018-11-23 10:11:23 +01:00
Maxime Gimeno 33482dc532 Fix conflicts 2018-11-21 10:55:09 +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