songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
96,424 Commits 3 Branches 156 Tags 962 MiB
Commit Graph

4234 Commits

Author SHA1 Message Date
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
Maxime Gimeno 83c9a00d73 Fix Conflict 2020-12-03 09:44:03 +01:00
Maxime Gimeno a6dab0379c Fix text in LICENSE and LICENSE.md 2020-12-03 09:43:14 +01:00
Maxime Gimeno b477021ad1 Remove LICENSE.FREE_USE from installation tests 2020-12-03 09:12:08 +01:00
Andreas Fabri 2d4ff0a9ac Replace LICENSE.FREE_USE by CC0 2020-11-26 13:33:14 +00:00
Laurent Rineau 58af499996 master now targets CGAL-5.3-dev 2020-11-20 21:34:18 +01:00
Laurent Rineau a60a9e638d Next release will be 5.2-beta2 2020-11-18 20:30:18 +01:00
Mael Rouxel-Labbé d6f06b9f14 Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-11-17 10:24:16 +01:00
Laurent Rineau a8f143d6a8 This branch now targets 5.1.2 2020-11-16 19:39:23 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Laurent Rineau 3e31a74859
Merge pull request #5159 from MaelRL/CGAL-Prepare_changes.md-5.2-GF 2020-11-16 14:44:16 +01:00
Laurent Rineau 048b29d671 Fix links 2020-11-16 09:08:54 +01:00
Mael Rouxel-Labbé c9db053fa8 Prepare CHANGES.md for 5.2 2020-11-13 17:27:22 +01:00
Andreas Fabri f246c4abf8 merge 2020-11-13 16:26:57 +00:00
Laurent Rineau 1d9bebc673 Prepare CGAL-5.2-beta1 2020-11-13 16:37:15 +01:00
Laurent Rineau 49e7ddccc9 Merge pull request #4243 from maxGimeno/Cmake_improvements-maxGimeno 
General CMake improvements
 2020-11-13 15:43:54 +01:00
Laurent Rineau 2f73dab22f Merge pull request #5071 from sgiraudot/PSP-Scanline_orient_normals-GF 
[Small Feature] Scanline Orient Normals
 2020-11-13 15:31:56 +01:00
Andreas Fabri 6b9bd51fcb Rename license file 2020-11-12 14:45:14 +00:00
Maxime Gimeno 8e23d5c482 Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-11-10 09:00:41 +01:00
Laurent Rineau 3d6d9f541f Fix merge issues (not visible as Git conflicts) 2020-11-10 08:51:31 +01:00
Laurent Rineau d0dd5a93bf Merge pull request #4639 from janetournois/Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF 
Small feature - Triangulation Segment Cell/Simplex Iterator
 2020-11-10 08:45:38 +01:00
Simon Giraudot d998347f91 Move section in CHANGES.md to the correct release 2020-11-10 08:25:48 +01:00
Simon Giraudot 6236370402
Update Installation/CHANGES.md 
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
 2020-11-09 14:31:42 +01:00
Simon Giraudot e6c23195ed Update CHANGES.md 2020-11-09 08:36:38 +01:00
Maxime Gimeno cc00d293df Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-11-06 09:37:18 +01:00
Ahmed Essam bb17d4909f
Merge branch 'master' into AABBTreeC++11 2020-10-29 23:04:48 +00:00
Maxime Gimeno 1c00bf6847 Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-29 15:09:16 +01:00
Laurent Rineau a6c5402dc6
Merge pull request #4885 from MaelRL/Iterative_authalic_parameterization 2020-10-29 14:21:42 +01:00
Laurent Rineau 5d7c6e55c3 Merge pull request #5047 from sloriot/SM-do_not_clear_properties 
Add a way to not remove properties after clearing the mesh
 2020-10-29 10:53:05 +01:00
Mael 38c3dc7924 Merge branch 'master' into Iterative_authalic_parameterization 2020-10-28 17:34:01 +01:00
Mael a6d1023301 Update CHANGES.md 2020-10-28 17:32:14 +01:00
Laurent Rineau 41211e308b Merge branch '5.1.x-branch' 2020-10-28 09:52:34 +01:00
Laurent Rineau 6007fe7c04 Merge branch 'releases/CGAL-5.0-branch' into 5.1.x-branch 2020-10-28 09:51:02 +01:00
Maxime Gimeno aa26d7a58b Fix merging error 2020-10-28 08:45:29 +01:00
Laurent Rineau 27d585438b Support non-header-only 2020-10-27 09:16:53 +01:00
Maxime Gimeno 2ad4c16b6e Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-26 15:00:53 +01:00
Laurent Rineau 14f27a2b41 Fix CTest issues with CGAL_Qt5 
Add a target `compilation_of__CGAL_Qt5_moc_and_resources`, and a
corresponding CTest test, so that `CGAL_Qt5_moc_and_resources` is
always compiled first, when needed. That will fix CTest
race-conditions, where `CGAL_Qt5_moc_and_resources` was being compiled
by several CTest test at the same time.
 2020-10-26 13:52:33 +01:00
Simon Giraudot 066712c881 Use Orthtree everywhere + define Octree/Quadtree aliases 2020-10-22 13:00:34 +02:00
Sebastien Loriot da0d6fda44
Merge branch 'master' into Classification-Simpler_IO_for_ETHZ_Random_forest-GF 2020-10-21 08:28:55 +02:00
Sébastien Loriot 5a6333f014 Merge remote-tracking branch 'cgal/master' 2020-10-20 13:42:46 +02:00