Commit Graph

4273 Commits

Author SHA1 Message Date
Laurent Rineau 8dc3256685 Merge pull request #5488 from sgiraudot/Classification-Remove_TensorFlow_support-GF
[Small Feature] Remove TensorFlow support
2021-04-06 15:13:15 +02:00
Laurent Rineau 8247232cf1 Merge pull request #5535 from sloriot/CGAL-more_cmake_support_files
Add more cmake support files
2021-04-06 15:13:04 +02:00
Maxime Gimeno e5bf52d9c6 fix indentation and remove GMP_LIBRARIES_DIR 2021-04-02 14:56:50 +02:00
Maxime Gimeno 9a4d495567 don't use generator expression 2021-04-02 14:47:46 +02:00
Maxime Gimeno c5ebd7c88e dichotomize multiconfig generators 2021-04-02 14:30:02 +02:00
Maxime Gimeno 16ee70bb12 Use a generator expression to determine the lib to use 2021-04-02 14:11:23 +02:00
Maxime Gimeno 87bb3b27d1 Split GMP_LIBRARIES into debug and release. 2021-04-02 12:56:05 +02:00
Simon Giraudot 4d761ed9cd More corrections from review 2021-04-01 14:21:01 +02:00
Simon Giraudot 616cd5a549 Apply corrections from review 2021-04-01 08:55:51 +02:00
Laurent Rineau 0e49e18bd3 Merge pull request #5460 from lrineau/CGAL-as_a_CMake_subdirectory-GF
Allow to use CGAL as a submodule of a bigger CMake project
2021-03-24 15:05:31 +01:00
Laurent Rineau 5bfdd8e0dd Merge pull request #5467 from afabri/afabri-patch-1
Remove outdated URL
2021-03-24 15:05:27 +01:00
Laurent Rineau 79ba1af61f Merge pull request #5492 from sloriot/PMP-coref_full_edge_visitor
Add missing visitor calls for the output_builder part
2021-03-24 15:05:24 +01:00
Simon Giraudot 76000bd396 Update CHANGED.md 2021-03-23 08:12:11 +01:00
Simon Giraudot 8e06889d90 Rebase 2021-03-22 15:17:34 +01:00
Sébastien Loriot 887b7d0eaa add METIS cmake support file 2021-03-18 14:58:04 +01:00
Sébastien Loriot ac15312260 add Ceres support cmake file 2021-03-18 14:47:56 +01:00
Mael Rouxel-Labbé ede18b776c Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2021-03-18 10:42:52 +01:00
Laurent Rineau ea27c11373 This branch now targets 5.2.2 2021-03-17 17:51:40 +01:00
Laurent Rineau a95295f9a6 This branch now targets 5.1.4 2021-03-17 17:50:53 +01:00
Simon Giraudot 20162feb3d Rebase on master 2021-03-11 13:20:34 +01:00
Laurent Rineau 26bf22f8c5 Merge pull request #5370 from VincentRouvreau/document_insert_if_in_star_regular_triangulation
Add some documentation for Regular_triangulation::insert_if_in_star
2021-03-10 12:19:28 +01:00
ROUVREAU Vincent 28932cd065 Merge master and resolve conflicts for Installation/CHANGES.md 2021-03-10 11:48:55 +01:00
ROUVREAU Vincent eb04a9b3ce Add change description in CHANGES.md 2021-03-10 11:42:07 +01:00
Maxime Gimeno 4470fe8481 fix conflicts 2021-03-09 15:51:25 +01:00
Simon Giraudot 46b9452ef4 Rebase on master 2021-03-04 13:48:11 +01:00
Laurent Rineau 3ab3b10d47 Merge pull request #5247 from MaelRL/SDG-Fix_doc-GF
Doc improvements for TDS-related classes
2021-03-03 17:38:18 +01:00
Laurent Rineau cb8e564ac7 Merge pull request #5349 from afabri/Polyline_simplification-simplify_overlaps-GF
2D Polyline simplification: Also simplify overlapping vertex sequences
2021-03-03 17:35:27 +01:00
Laurent Rineau 962f891702 Merge pull request #5367 from gdamiand/gsoc2020-Surface_mesh_topology-Simplicity-johnmave126
Surface Mesh Topology: Test Whether a Closed Curve is Homotopic to a Simple Cycle
2021-03-03 17:33:15 +01:00
Laurent Rineau ab6145babc Merge pull request #5501 from maxGimeno/CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.2-maxGimeno
CMake Fixes when CGAL_Core is disabled (5.2)
2021-03-03 17:20:55 +01:00
Simon Giraudot a330b0120f Update CHANGES.md 2021-03-03 13:26:49 +01:00
Simon Giraudot 6e811d6a8f Rebase on master 2021-03-03 12:56:57 +01:00
Maxime Gimeno b4de351840 Merge branch 'CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.1-maxGimeno' into CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.2-maxGimeno 2021-03-02 10:16:01 +01:00
Maxime Gimeno 7d21d5b62d De-activate some things that depend on CGAL_Core if it is not FOUND 2021-03-01 11:27:43 +01:00
Sebastien Loriot 11f2b92b7b
Merge branch 'master' into gsoc2020-Surface_mesh_topology-Simplicity-johnmave126 2021-02-25 13:43:38 +01:00
Sébastien Loriot 484977bb5b update changes 2021-02-24 16:57:21 +01:00
Simon Giraudot 8264096ee7 Remove TensorFlow support from Classification 2021-02-23 08:52:02 +01:00
Mael Rouxel-Labbé 5efa544734 Merge remote-tracking branch 'cgal/master' into SDG-Fix_doc-GF 2021-02-22 17:19:40 +01:00
Mael Rouxel-Labbé 57772f7e2c Announce the removal of obsolete & deprecated alpha shape traits classes 2021-02-22 17:16:53 +01:00
Laurent Rineau a9e234cf92 Merge pull request #5050 from efifogel/Bso-oriented_side-efif
2D Boolean Set Operations: Improve Dcoumentation of Free Function
2021-02-18 15:26:53 +01:00
Laurent Rineau 7edf0f2458 Merge pull request #5350 from maxGimeno/PSP_3-Fixes-for_pointmatcher-maxGimeno
PSP_3: Fix pointmatcher support
2021-02-18 15:26:22 +01:00
Laurent Rineau db338aa1ee Merge pull request #5417 from maxGimeno/Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno
QGLViewer: remove the need for Qt5::Xml
2021-02-18 15:19:06 +01:00
Laurent Rineau fa1a355751 Merge branch '5.1.x-branch' into 5.2.x-branch 2021-02-18 15:19:05 +01:00
Laurent Rineau 7d760d8a72 Merge pull request #5350 from maxGimeno/PSP_3-Fixes-for_pointmatcher-maxGimeno
PSP_3: Fix pointmatcher support
2021-02-18 15:18:08 +01:00
Andreas Fabri 662eab79d0 More removal of lines as suggested by Laurent 2021-02-17 10:06:16 +00:00
Andreas Fabri ed44ebff0f Improve documentation of overlapping polylines 2021-02-16 10:43:04 +00:00
Maxime Gimeno 2f6a9ff599 Allow to use CGAL as a submodule of a bigger CMake project
The trick is to use
  - `CGAL_SOURCE_DIR` instead of `CMAKE_SOURCE_DIR`, and
  - `CGAL_BINARY_DIR` instead of `CMAKE_BINARY_DIR`.

See
  https://cmake.org/cmake/help/latest/variable/PROJECT-NAME_SOURCE_DIR.html
  https://cmake.org/cmake/help/latest/variable/PROJECT-NAME_BINARY_DIR.html
> This can be useful when add_subdirectory() is used to connect several projects.
2021-02-15 09:07:10 +01:00
Andreas Fabri b1a86b749a
Update CMakeLists.txt 2021-02-12 14:44:02 +01:00
Maxime Gimeno 08ea69f57c More remaining xml 2021-02-10 13:43:25 +01:00
Maxime GIMENO 363b8400dd
Update Installation/CMakeLists.txt
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-02-10 08:35:07 +01:00
Maxime Gimeno b5ead13803 add leda 2021-02-09 14:57:50 +01:00
Maxime Gimeno 602b8d6951 Restore missing deps info in installation if running testsuite 2021-02-09 14:44:16 +01:00
Maxime Gimeno 2500331070 Merge remote-tracking branch 'cgal/master' into Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno 2021-02-09 12:33:52 +01:00
Maxime Gimeno 9cd0d450f9 Remove QDomElements and need for QtXml 2021-02-09 11:31:34 +01:00
Laurent Rineau 7d526225af Merge pull request #5388 from maxGimeno/Ipeets-Fix_after_merge-maxGimeno
CGAL_Ipelets: Fix after merge in master.
2021-02-05 16:10:15 +01:00
Andreas Fabri 4953ff71e0 fix typo 2021-02-04 11:22:06 +00:00
Maxime Gimeno c23b0c33e3 limit the number of qt5 components in installation test 2021-02-04 12:01:14 +01:00
Maxime Gimeno 61d3ce86d2 Fix qt5 installation test 2021-02-04 10:40:59 +01:00
Andreas Fabri 6dc30a1442 Update the change log 2021-02-01 13:09:49 +00:00
Maxime Gimeno 89d199616b Remove remaining not header_only code 2021-01-29 15:56:13 +01:00
Mael Rouxel-Labbé 1e7b9863cb Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2021-01-28 17:48:09 +01:00
Efi Fogel 124076bcb4 Merge remote-tracking branch 'cgal/master' into Bso-oriented_side-efif 2021-01-28 17:39:04 +02:00
Maxime Gimeno 4ed3b0129c make the dependencies to boost general, not just for windows 2021-01-25 15:35:27 +01:00
Maxime GIMENO c5da5251b1
Update Installation/cmake/modules/FindIPE.cmake
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-01-25 14:54:00 +01:00
Maxime Gimeno 01374debeb Drop Ipe 6 support 2021-01-25 13:39:36 +01:00
Laurent Rineau ca9febf3b8 Merge pull request #5063 from maxGimeno/CMake-modernization-maxGimeno
CMake modernization

# Conflicts:
#	CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
2021-01-22 15:25:54 +01:00
Laurent Rineau 9bb0366741 Merge pull request #5360 from sloriot/CGAL-Eigen3_support
Fix macro name to be consistent with find_package
2021-01-21 16:22:32 +01:00
Maxime Gimeno 3ccd79eec6 Don't check if CGAL_comp is found, it will be done later. 2021-01-20 15:25:55 +01:00
Maxime Gimeno fab8c31662 Keep from using CGLA_Core if CGAL_DISABLE_GMP is ON 2021-01-19 10:15:43 +01:00
Simon Giraudot ae8ec55eac Merge remote-tracking branch 'jackson/gsoc2020-Octree-campolattaro' into gsoc2020-Octree-campolattaro 2021-01-19 09:54:58 +01:00
Maxime Gimeno 9ac0a1de04 Merge remote-tracking branch 'cgal/master' into CMake-modernization-maxGimeno 2021-01-18 11:52:30 +01:00
Guillaume Damiand 3ef8ea445c Merge branch 'master' into gsoc2020-Surface_mesh_topology-Simplicity-johnmave126 2021-01-18 11:24:33 +01:00
Laurent Rineau 287836254f Fix CHANGES.md for CGAL I/O
See https://github.com/CGAL/cgal/pull/4255#issuecomment-760933103.
2021-01-15 14:16:30 +01:00
Maxime Gimeno 99a31e07fe Move the Boost components in the support file and condition it to windows. 2021-01-15 14:07:17 +01:00
Sébastien Loriot bc161f2ae9 Merge 'CGAL-Eigen3_support-5.2' 2021-01-15 10:59:20 +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
Laurent Rineau dffa89b2cd Update CHANGES.md after the merge of CGAL I/O
Two links are missing.
2021-01-14 15:51:44 +01:00
Maxime Gimeno fa22cd972b Change libpointmatcher_support so it won't fail when old boost has been used to build pointmatcher. 2021-01-14 13:58:15 +01:00
Maxime Gimeno a7ed8c429c triling whitespace 2021-01-13 15:17:24 +01:00
Maxime Gimeno 2255f8e8ea Merge remote-tracking branch 'cgal/master' into CMake-modernization-maxGimeno 2021-01-13 14:34:09 +01:00
Maxime Gimeno 232327c81c Set LAS as system headers to skip warnings in testsuite 2021-01-11 09:55:30 +01:00
Maxime Gimeno 3d1c41fd14 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2021-01-07 15:05:28 +01:00
Laurent Rineau 85325d789f Merge pull request #5090 from afabri/FastEnvelope-GF
Polygon Mesh Processing:  Add envelope test
2021-01-06 16:11:56 +01:00
Laurent Rineau d6f76d4f87 Merge pull request #5299 from maxGimeno/Checks_in_github-maxGimeno
CI: Add Checks in GitHub Actions
2021-01-06 16:11:08 +01:00
Laurent Rineau fee181b6eb Merge pull request #5299 from maxGimeno/Checks_in_github-maxGimeno
CI: Add Checks in GitHub Actions
2021-01-06 16:04:47 +01:00
Maxime Gimeno fc4fc891e7 Fix dependencies 2020-12-29 14:33:49 +01:00
Maxime Gimeno f6874b2d31 Add checks for pushes 2020-12-29 14:33:29 +01:00
Laurent Rineau 3c90fd817f Revert "Revert "Next release on this branch will be 5.2.1""
This reverts commit cc78d68342.
2020-12-23 16:54:48 +01:00
Laurent Rineau cc78d68342 Revert "Next release on this branch will be 5.2.1"
This reverts commit 7b508d6385.
2020-12-23 16:27:56 +01:00
Laurent Rineau 7b508d6385 Next release on this branch will be 5.2.1 2020-12-22 16:16:05 +01:00
Laurent Rineau f79fbb34d3 This branch now targets 5.1.3 2020-12-22 11:55:08 +01:00
Laurent Rineau 485e672c26 Prepare for 5.2 final version 2020-12-18 15:58:54 +01:00
Maxime Gimeno 1d98f0f71d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-12-09 14:40:02 +01:00
Sebastien Loriot 48a1273546
Update Installation/CHANGES.md
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2020-12-08 09:36:55 +01:00
Sébastien Loriot 7b8f5ce7ed update changes 2020-12-07 16:49:49 +01:00
Sébastien Loriot 08eeacca8b Merge remote-tracking branch 'cgal/master' into FastEnvelope-GF 2020-12-07 16:40:34 +01:00
Laurent Rineau 7506e5da16 Prepare CHANGES.md for 5.3 2020-12-07 16:35:24 +01:00
Laurent Rineau ffc56a3251 Merge pull request #5139 from MaelRL/CGAL-Improve_license_doc-GF
Installation: Doc and license-less license clarifications
2020-12-04 17:16:13 +01:00
Maxime Gimeno 6f50502b3e Re-add Creative Commons 2020-12-03 10:32:55 +01:00
Maxime Gimeno 334d49b1e7 Use CC0 instead of full name 2020-12-03 10:14:29 +01:00