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

844 Commits

Author SHA1 Message Date
Laurent Rineau 47aab15a17 Next version in this branch will be 5.4.1 2022-01-31 17:26:46 +01:00
Laurent Rineau c58ac97e93 Prepare 5.4.x-branch for the release of version 5.4 2022-01-27 12:12:21 +01:00
Andreas Fabri 2455db6692 The warning needs quotes. Exclude VC2015 from a test 2022-01-18 11:39:00 +00:00
Laurent Rineau f558b8aa3c `master` is now for CGAL-5.5 2022-01-17 10:08:04 +01:00
Laurent Rineau 7906e3928a Merge pull request #6174 from afabri/CGAL_Discontinue_Geomview-GF 
Remove Geomview
 2021-12-20 18:06:29 +01:00
Laurent Rineau c5d01fc96e This branch now targets a possible 5.4-beta2 2021-12-17 17:41:29 +01:00
Laurent Rineau 2010a410e2 Prepare CGAL-5.4-beta1 2021-12-14 15:35:03 +01:00
Andreas Fabri 115fa5ab39 Remove Geomview from the manual and the demos 2021-12-14 14:01:21 +00:00
Andreas Fabri 3dd497f2b6 Do not use #warning 2021-11-03 22:24:51 +01:00
Laurent Rineau 90381147f2 Merge pull request #6052 from sloriot/Intersection_2-segment_segment_inter_info 
Improve 2D segment intersection
 2021-10-29 16:59:47 +02:00
Sébastien Loriot 85c00352c3 separate macros and macro function 2021-10-27 16:01:19 +02:00
Sébastien Loriot 604d2fd1ff direct definition 
the extra if was generating fallthru warnings
 2021-10-27 15:19:05 +02:00
Sébastien Loriot 12bf0e9c60 switch to LGPL 2021-10-18 17:37:27 +02:00
Laurent Rineau e5ab9202f5 Merge pull request #4229 from gdamiand/CGAL_data-gdamiand 
Regroup data: scripts and function updates
 2021-09-23 16:14:11 +02:00
Sebastien Loriot 4610cf3c66
Merge pull request #5904 from sloriot/CGAL-remove_config_flags 
Replace macros with inline functions and remove a config flag
 2021-09-10 17:38:50 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Sébastien Loriot de6d8c6cbd Merge pull request #5742 from danston/Shape_regularization-new_package-danston 
[Feature] Shape Regularization New Package
 2021-08-13 18:19:35 +02:00
Sébastien Loriot 6481cb23d9 remove CXX11 config variables related to threads 2021-08-13 16:44:53 +02:00
Sébastien Loriot 63a764b79c remove some cpp0x and cpp11 config macros 2021-08-13 16:25:40 +02:00
Sébastien Loriot 00fd00fafc replace macros with inline functions and remove a config flag 2021-08-13 15:24:41 +02:00
Dmitry Anisimov 933940435a Merge remote-tracking branch 'origin/master' into Shape_regularization-new_package-danston 2021-08-04 15:30:10 +02:00
Dmitry Anisimov 50157a7479 Merge remote-tracking branch 'origin/master' into Weights-new_package-danston 2021-08-04 15:12:04 +02:00
Laurent Rineau 5759a800e3
Merge pull request #5705 from maxGimeno/CGAL-Clean_up_boost_versions-maxGimeno 2021-07-28 10:14:38 +02:00
Maxime Gimeno 97cac65a86 Fix __GNUC__ tests 2021-07-23 10:59:49 +02:00
Sébastien Loriot f153a1ed3e Merge remote-tracking branch 'cgal/master' into HEAD 2021-07-22 13:15:22 +02:00
Maxime Gimeno f8ebb77959 Fix test on CGAL_GCC_VERSION, that is 0 if the compiler is not GCC, not undefined 2021-07-21 14:21:05 +02:00
Marc Glisse e7357ac003 Merge remote-tracking branch 'cgal/master' into mt-glisse 
several PRs in Filtered_kernel conflicted with this :-(
 2021-07-19 14:53:27 +02:00
Maxime Gimeno b2c07c7841 fix config.h 2021-07-19 14:50:59 +02:00
Maxime Gimeno 049e1a7551 No more CGAL_NOEXCEPT 2021-07-19 14:29:51 +02:00
Maxime Gimeno a3d1765ab4 Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno 2021-07-19 14:18:40 +02:00
Laurent Rineau 6de515bedc master targets CGAL-5.4-dev 2021-07-06 14:57:08 +02:00
Laurent Rineau 469d8afd5c Next release in this branch will be 5.3.1 2021-07-06 14:53:04 +02:00
Laurent Rineau 484ee4c6c4 Change the release name, from 5.3-beta2 to 5.3 
...and prepare for the near publication of 5.1.5 and 5.2.3.
 2021-07-02 12:46:43 +02:00
Dmitry Anisimov 672a6e8e30 Merge remote-tracking branch 'origin/Solvers-add_osqp-danston' into Shape_regularization-new_package-danston 2021-06-18 16:15:53 +02:00
Dmitry Anisimov 8bc8f70bc5 fixed license files for three more packages running the new version of the script 2021-06-17 11:44:41 +02:00
Dmitry Anisimov 893ab175b9 fixed typo in the orthtree package description 2021-06-17 11:43:50 +02:00
Dmitry Anisimov 72a8b223d2 fixed another bug in the generating license script 2021-06-17 11:43:14 +02:00
Dmitry Anisimov 3edff7bbf1 following PR #5778 the license headers are updated 2021-06-17 10:49:45 +02:00
Laurent Rineau 3613a94638
Merge pull request #5778 from danston/Installation-license_generator_fix-danston 2021-06-17 10:33:23 +02:00
Dmitry Anisimov 231bcfa751 laurent's review 2021-06-17 10:28:03 +02:00
Laurent Rineau 6a9061668c Merge pull request #5756 from albert-github/feature/bug_redirects 
Correction of hyperlinks
 2021-06-16 15:06:08 +02:00
Dmitry Anisimov 75ceb859ec fixed the error with empty package pretty name 2021-06-14 18:26:07 +02:00
Dmitry Anisimov 2467aece1e updated Weights license 2021-06-14 18:22:24 +02:00
Marc Glisse dbe94c282e Move is_currently_single_threaded to namespace CGAL 2021-06-11 22:47:11 +02:00
Dmitry Anisimov 20baa77b26 fixed license 2021-06-11 13:33:51 +02:00
Dmitry Anisimov 542f67bfe0 fixed license 2021-06-11 12:59:00 +02:00
Laurent Rineau 3dce682668 CGAL-5.3-beta1 was released 2021-06-11 09:58:18 +02:00
albert-github 2a54687e77 Correction of hyperlinks 
The link checker gave a number of redirects and incorrect links.
- the redirects have been solved ass far as possible
- the incorrect links have been checked and corrected where possible, others  have been reported through issues;
 2021-06-04 13:52:14 +02:00
Laurent Rineau ac5d63d479 Prepare CGAL-5.3-beta1 2021-06-02 14:45:48 +02:00
Laurent Rineau 8fa0f55ac7
Merge branch 'master' into mt-glisse 2021-05-27 10:27:38 +02:00
Laurent Rineau 59a0da4f13 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno 
CGAL:: Use std atomic and threads

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
 2021-05-19 17:23:53 +02:00
Laurent Rineau 2c4a5db3ce Merge pull request #5631 from GilesBathgate/STL_ext-fix_uncaught_exceptions_cleanup-GilesBathgate 
Fix uncaught exceptions cleanup
 2021-05-18 18:14:14 +02:00
Laurent Rineau d6b2c8d9dc Merge pull request #5671 from maxGimeno/CGAL_IO-Add_missing-deprecated_functions-maxGimeno 
CGAL_IO: Add missing fallbacks

# Conflicts:
#	BGL/include/CGAL/boost/graph/IO/INP.h
#	Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
 2021-05-18 18:13:38 +02:00
Maxime Gimeno 0b229ae043 move result_of out of deprecated_code. It is not deprecated, we need the wokaround for c++20 2021-05-17 11:57:44 +02:00
Maxime Gimeno e6c767d5c9 Simplify the GNUC versions tests 2021-05-12 15:45:07 +02:00
Maxime Gimeno 393ae7dae6 Clean-up boost_version reqs 2021-05-12 15:03:53 +02:00
Maxime Gimeno 9533a9fea8 remove CGAL/result_of.h and move its content to config.h 2021-05-07 12:51:07 +02:00
Maxime Gimeno e775ed2ebc use CGAL/result_of instead of std::result_of in config.h 2021-05-07 12:51:00 +02:00
Maxime Gimeno 9acf3d4b19 Add missing fallbacks for IO functions and result_of 2021-05-07 12:50:51 +02:00
Maxime Gimeno e9b7595fff Deprecate CGAL headers for threads, atomic and result_of, and move their content to config.h as fallback 2021-05-07 11:09:24 +02:00
Sébastien Loriot c863ee6754 fix check_headers compilation issues 2021-05-04 17:28:52 +02:00
Guillaume Damiand 9ae15acd05 trailing 2021-05-04 13:17:49 +02:00
Guillaume Damiand f6e27d411b fix for windows 2021-05-04 13:07:12 +02:00
Guillaume Damiand 8593825f59 Add special code for windows to replace the use of getenv 2021-05-04 10:58:58 +02:00
Giles Bathgate 0ef8127c71 The CGAL_NOEXCEPT macro is no longer needed 2021-04-28 21:03:00 +01:00
Sebastien Loriot b8bc56ca12
Merge pull request #4421 from MaelRL/Triangulation_on_sphere_2-GF 
new package: Triangulation on the sphere
 2021-04-21 15:24:45 +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 a95295f9a6 This branch now targets 5.1.4 2021-03-17 17:50:53 +01:00
Marc Glisse 220d26da98 Merge remote-tracking branch 'cgal/master' into mt-glisse 2021-02-18 22:10:12 +01:00
Sébastien Loriot 422e0c30bb use string instead of char* 2021-02-05 09:12:06 +01:00
Sébastien Loriot 93017e8d71 remove get_ prefix 2021-02-04 08:56:26 +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
Guillaume Damiand 9e9c183778 Simplify function get_data_file_path (thanks @lrineau) 2021-01-20 10:02:12 +01:00
Guillaume Damiand a00a539259 Use CGAL_DATA_DIR only if it is defined 2021-01-19 15:45:25 +01:00
Guillaume Damiand dbdac7aa10 whitespaces 2021-01-19 15:30:23 +01:00
Guillaume Damiand b9cf04d1fa add function get_data_file_path() 2021-01-19 15:23:01 +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
Marc Glisse 9f0f7eb033 is_currently_single_threaded 2021-01-11 19:40:13 +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
Maxime Gimeno fc4fc891e7 Fix dependencies 2020-12-29 14:33:49 +01:00
Laurent Rineau f79fbb34d3 This branch now targets 5.1.3 2020-12-22 11:55:08 +01:00
Maxime Gimeno 1d98f0f71d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-12-09 14:40:02 +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 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
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
Andreas Fabri 6b9bd51fcb Rename license file 2020-11-12 14:45:14 +00:00
Simon Giraudot 066712c881 Use Orthtree everywhere + define Octree/Quadtree aliases 2020-10-22 13:00:34 +02:00
Sébastien Loriot 87b8f66e14 update from master 2020-10-20 09:19:13 +02:00
Andreas Fabri d2db2ac531 Put Envelope code in a header file in PMP 2020-10-20 09:17:16 +02:00
Mael Rouxel-Labbé e3c08cf7dc Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-10-19 16:17:27 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Vishal Pratap Singh aa9c627b4d Defined CXX20 2020-10-08 13:47:59 +05:30
Jane Tournois d07a5f2911 remove MSVC_compiler_config.h which is not needed anymore 2020-09-25 14:41:06 +02:00
Jane Tournois 5c8df6672a remove CGAL_CFG_MATCHING_BUG_ variants 
the "matching bug" of msvc has been fixed since at least vs 2015
 2020-09-25 14:25:14 +02:00
Mael Rouxel-Labbé db1823a470 Merge remote-tracking branch 'cgal/master' into Triangulation_on_sphere_2-GF 2020-09-22 14:27:09 +02:00
Mael Rouxel-Labbé 4bce5cfcd2 Add Tos2 to the various package lists + license 2020-09-22 14:13:16 +02:00
Mael Rouxel-Labbé 0ad161c61d Merge branch 'Triangulation_on_sphere_2-GF-old' 2020-09-22 14:10:03 +02:00
Mael Rouxel-Labbé 406488c86a Add some package structure (package info, license, cmakelists) 2020-09-22 14:01:54 +02:00
Mael Rouxel-Labbé 4694a48913 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-09-22 11:35:25 +02:00
Laurent Rineau 113048faef Merge pull request #4960 from maxGimeno/Demo-C3t3_can_read_mesh_with_domain_0-maxGimeno 
Polyhedron Demo: .mesh reading enhancement
 2020-09-11 15:07:47 +02:00
Laurent Rineau 2539022143 This branch 5.1.x-branch targets CGAL 5.1.1 2020-09-10 13:44:22 +02:00
Laurent Rineau 80168d85b2 Next release on master will be 5.2-dev 2020-09-08 16:44:17 +02:00
Maxime Gimeno aeda2ef58c Replace boolean name and prevent maxx_domain=0 2020-09-07 12:35:54 +02:00
Laurent Rineau b271ec54df Preparations for CGAL-5.1. 2020-09-04 15:18:51 +02:00
Maxime Gimeno 56af55ecd4 Fix bug in mesh_3 tests 2020-08-27 13:46:04 +02:00
Jackson Campolattaro b856dbdbfc Merge branch 'master' of github.com:CGAL/cgal into gsoc2020-Octree-campolattaro 2020-08-26 21:38:04 -04:00
Mael Rouxel-Labbé 8682f9bafb Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-08-24 11:45:17 +02:00
Sébastien Loriot 93d62b969c add forward declaration 
File_medit.h is included by Mesh_complex_3_in_triangulation_3_base.h
 2020-08-18 14:09:06 +02:00
Laurent Rineau a8ed7408c3 Prepare for a beta3 and let's hope it will not be needed 2020-07-28 11:24:19 +02:00
Sébastien Loriot 2a4f221197 handle license check for Octree 2020-07-22 07:45:12 +02:00
Laurent Rineau 022b1a71d0 Merge branch 'releases/CGAL-5.0-branch' 2020-07-21 15:27:49 +02:00
Laurent Rineau 2e8a59d570 Merge branch 'releases/CGAL-4.14-branch' into releases/CGAL-5.0-branch 2020-07-21 15:25:54 +02:00
Laurent Rineau ebdf7b2c04 Fix a compiler with the no_unique_address attribute, in C++03 2020-07-17 09:53:07 +02:00
Mael Rouxel-Labbé 17320106ce Update CGAL_DEPRECATED / CGAL_UNUSED to use C++14/17 attributes 2020-07-13 16:55:37 +02:00
Jane Tournois 5b474e0075 replace deprecated std::not1 by std::not_fn 
std::not1 is deprecated in C++17 and removed from C++20

+ add a C++17 macro in config.h
 2020-07-07 10:49:58 +02:00
Jane Tournois 1b7b19b451 silent a warning from boost and C++17 2020-07-06 13:50:55 +02:00
Jane Tournois b519de793b replace BOOST_MSVC by _MSC_VER 
The problem was that BOOST_MSVC is defined by <boost/config.hpp>, that is included later.
 2020-07-02 13:59:41 +02:00
Laurent Rineau dad9db1094 Merge pull request #4774 from lrineau/CGAL-remove_cpp11-GF 
Remove cpp11::(tuple|get)
 2020-06-23 18:50:17 +02:00
Maxime Gimeno ea53a8d70d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-06-17 14:25:21 +02:00
Laurent Rineau ec6c0d6758 Prepare for 5.1-beta2 2020-06-09 22:15:45 +02:00
Laurent Rineau 52b83a9316 Merge remote-tracking branch 'cgal/master' into CGAL-remove_cpp11-GF 2020-06-09 20:14:42 +02:00
Laurent Rineau ec1dd745e0 Remove cpp11::(tuple|get) 
And use `#ifdef CGAL_NO_DEPRECATED_CODE` around the backward
compatibility code in `<CGAL/config.h>`.
 2020-06-09 20:11:45 +02:00
Laurent Rineau 9b8ecd720b Merge pull request #4636 from sgiraudot/CMake-Third_party_imported_targets-GF 
CMake: Use Imported Targets for 3rd Party Libs
 2020-06-05 17:54:14 +02:00
Laurent Rineau daf86cc719 Prepare for 5.1-beta1 2020-06-04 09:42:02 +02:00
Laurent Rineau a828cb0d06 Merge pull request #4620 from janetournois/Tetrahedral_remeshing-new-jtournois 
Tetrahedral remeshing - new package
 2020-06-03 16:23:17 +02:00
Maxime Gimeno 4af1e73f69 Work around for moc bug 2020-06-02 10:12:10 +02:00
Laurent Rineau 7173530dad Merge pull request #4557 from lrineau/NewKernel_d-det-GF-CGAL-5.0 
NewKernel_d: Accelerate by using Mpzf instead of Gmpq (CGAL-5.0 and later)
 2020-05-27 18:27:56 +02:00
Jane Tournois b6912d92ea fix warnings 
- move #define a better location
- conversion double/size_t
- unused parameters
- automatic conversion int/boolean
 2020-05-15 13:54:19 +02:00
Jane Tournois 3d5fc5c1ca silent warning "STL4009: std::allocator<void> is deprecated in C++17." 
from boost-1_71\boost/bimap/detail/manage_additional_parameters.hpp(86):
warning C4996: 'std::allocator<void>': warning STL4009: std::allocator<void>
 is deprecated in C++17.
You can define _SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING or
_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS
to acknowledge that you have received this warning.

see https://github.com/boostorg/beast/issues/1272
it seems that this warning is an error in msvc
 2020-05-14 13:51:41 +02:00
Mael Rouxel-Labbé 01d5e5f2b8 Add CGAL_NO_UNIQUE_ADDRESS 2020-05-12 12:53:59 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Jane Tournois cf58a08a55 Merge branch 'master' into Tetrahedral_remeshing-new-jtournois 2020-04-20 06:24:36 +02:00
Sébastien Loriot 825f77baaa add license include directives 2020-04-10 14:14:30 +02:00
Maxime Gimeno 4e6fb685c6 Merge remote-tracking branch 'mine/CGAL_IO-maxGimeno' into HEAD 2020-03-27 11:11:10 +01:00
Sébastien Loriot 5c5d445eb3 Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:27:43 +01:00
Sébastien Loriot 35b83deffd Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:16:25 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces 
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
 2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch' 
whitespace+tab removal, merged with option -Xignore-space-change
 2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces 
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
 2020-03-26 14:16:06 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Mael Rouxel-Labbé 54d41c816b Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-24 12:03:07 +01:00
Laurent Rineau 2f4e49bfff Fix forward-declarations of CGAL::Surface_mesh 
In the forward-declaration, the template parameters do not matter, but
they do if the code is read by an IDE (with IntelliSense for example).
 2020-03-23 09:47:01 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Laurent Rineau 4c86c9f58a wip 2020-03-10 16:42:15 +01:00
Mael Rouxel-Labbé 3e365756ca Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2020-03-09 16:54:25 +01:00
Laurent Rineau 0dfd416395 Use [[noreturn]] directly 2020-03-06 09:26:54 +01:00
Laurent Rineau 2b01447391 Next release on this branch will be 5.0.3 2020-02-25 09:46:40 +01:00
Laurent Rineau e40aaafd28 Next release in this branch will be 4.14.4 2020-02-25 09:43:08 +01:00
Mael Rouxel-Labbé 65c1a4f81b Clean code and headers (no real changes) 2020-01-28 12:10:59 +01:00
Laurent Rineau 7868c454e7 Next version on this branch will be 5.0.2 2020-01-27 11:24:09 +01:00
Michel Zou 17a58a5625 version.h: workaround for SWIG parsing 2020-01-17 16:36:35 +01:00
Michel Zou f86b948845 version.h: workaround for SWIG parsing 2020-01-17 16:32:07 +01:00
Laurent Rineau d26c2e9e53 Merge pull request #4475 from lrineau/Installation-workaround_for_SWIG_parser-xantares-lrineau 
Workaround for SWIG parser
 2020-01-17 16:26:13 +01:00
Michel Zou 3b8d77aa8a version.h: workaround for SWIG parsing 2020-01-14 10:01:00 +01:00
Laurent Rineau e628e6e203 This branch target 4.14.3 2019-12-12 10:50:20 +01:00
Mael Rouxel-Labbé 844cd55f85 Add license files 2019-12-09 15:43:30 +01:00
Guillaume Damiand 90457b38c7 Update licences 2019-11-26 14:21:39 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Laurent Rineau abd7f5a099 Mext release in this branch will be 5.0.1 2019-11-08 20:57:39 +01:00
Laurent Rineau 68ca489924 Next release on master will be 5.1-dev 2019-11-08 18:13:44 +01:00
Laurent Rineau 27dcff6141 Prepare CGAL-5.0 finale version 2019-11-08 10:58:29 +01:00
Sébastien Loriot bff5db68e1 fix some remaining license notice + add a missing LicenseRef-Commercial 2019-10-31 14:17:20 +01:00
Laurent Rineau 387f55cfca Next version in this branch will be 5.0-beta3 (or the final release) 2019-10-31 10:32:50 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 1c829dcb08 remove extra space 2019-10-18 22:04:37 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags 
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
 2019-10-18 21:57:54 +02:00
Laurent Rineau 47fcaf3d47 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF 
Do not require -DCGAL_HEADER_ONLY
 2019-10-15 16:34:09 +02:00
Laurent Rineau 119055d688 Merge pull request #4281 from sloriot/CGAL-default_endian 
Add a way to define a default endianness
 2019-10-15 16:31:39 +02:00
Laurent Rineau b6a935c3cf Merge pull request #4292 from maxGimeno/CGAL_Config-Fix_typo-maxGimeno 
Remove extra S in macro
 2019-10-15 16:31:24 +02:00
Maxime Gimeno 856b7722f1 Remove extra S in macro 2019-10-15 09:03:13 +02:00
Laurent Rineau 9c67734dcc Push the `#define CGAL_HEADER_ONLY` at the top 2019-10-11 12:02:25 +02:00
Laurent Rineau e872e74654 Refactor the code 2019-10-10 17:59:46 +02:00
Sébastien Loriot 2f1ab3a86d rename macro 2019-10-10 14:45:42 +02:00
Sébastien Loriot 66e3b216be add a way to define a default endian 2019-10-10 13:00:33 +02:00
Laurent Rineau 779ef144fe Do not require -DCGAL_HEADER_ONLY 
Now, that macro is set unless `CGAL_NOT_HEADER_ONLY` is 1.
 2019-10-01 18:10:30 +02:00
Laurent Rineau 44547d40ec Next release in this branch will be 5.0-beta2 2019-09-30 15:25:45 +02:00
Laurent Rineau 5be38d3af0 Next release in this branch will be 4.14.2 2019-09-30 15:19:47 +02:00
Laurent Rineau 1bce3f7909 Merge branch 'releases/CGAL-4.14-branch' 2019-09-27 16:25:29 +02:00
Laurent Rineau 0b66eb0d23 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 
# Conflicts:
#	.travis/install.sh
 2019-09-27 16:24:41 +02:00
Maxime Gimeno 2473456405 update auto-link.h 2019-09-27 16:06:12 +02:00
Sébastien Loriot 724e70b97f Merge pull request #3984 from LiangliangNan/master 
New package 'Polygonal Surface Reconstruction' and an extension of 'Solver Interface'
 2019-07-18 17:05:25 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF 
PMP: Add locate.h and rewrite Triangulation_2 graph traits
 2019-07-18 16:40:49 +02:00
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets 
match @{ and @}
 2019-07-18 16:26:43 +02:00
Laurent Rineau 58e12565e3 Prepare release candidates for 5.0-beta1 2019-07-12 15:31:07 +02:00
Guillaume Damiand 7cd85f845b Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-07-10 15:32:21 +02:00
Laurent Rineau d3b9d89596 Merge pull request #4013 from lrineau/CGAL_Core-no_need_for_Boost.Thread-GF 
Remove the need for Boost.Thread (but for CGAL_Core and gcc<9.1)
 2019-07-10 14:22:53 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Maxime Gimeno 7155df2743 Merge remote-tracking branch 'cgal/master' into liangliang_master 2019-07-01 14:59:24 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00
Laurent Rineau 2ce7800239 Unfortunately gcc < 9.1 has bug with thread_local that impact CGAL 2019-06-24 14:27:20 +02:00
Guillaume Damiand 1dbc088459 Update licences; move undocumented files to internal (both directory and namespace) 2019-06-20 16:51:53 +02:00
Guillaume Damiand 62167eb065 Add surface mesh topology package in gpl list 2019-06-20 16:13:42 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +02:00
Liangliang Nan 4588ba5d9d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-19 15:08:53 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Liangliang Nan fadaee63a8 integrated PolyFit 2019-06-05 17:50:37 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Andreas Fabri 5532b84b4f nullptr_t -> std::nullptr_t 2019-06-05 07:28:56 +02:00
Dmitry Anisimov 3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston 2019-05-23 10:38:45 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF 
Fix some typos in code/comments/documentation
 2019-05-23 08:50:14 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch 
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
 2019-05-14 17:50:45 +02:00
Dmitry Anisimov 13d0156482 fixed docs, references, biblio, and license 2019-04-22 13:06:20 +02:00
Mael Rouxel-Labbé 52915956e3 Add PMP/locate.h 2019-04-19 08:39:02 +02:00
Simon Giraudot d8b51a9672 Merge remote-tracking branch 'laurent/Installation-remove_FindBLAS_LAPACK_TAUCS-GF' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-04-09 15:22:45 +02:00
Maxime Gimeno 78db3f646d Solve conflicts 2019-04-09 10:04:44 +02:00
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14 
Update for cpp14
 2019-04-08 15:59:28 +02:00
Laurent Rineau 3a32f3f3ef Restore CGAL::cpp11 temporarily 
This reverts commit 04978d8aae.
 2019-04-01 18:27:35 +02:00
Laurent Rineau e09f692e74 master now targets CGAL 5.0 2019-03-29 16:02:15 +01:00
Laurent Rineau 57a41b3d2a Towards CGAL-4.14.1 2019-03-29 15:59:03 +01:00
Laurent Rineau 99ca804f6d Maybe tonight's internal release will be CGAL-4.14 final 2019-03-28 16:45:09 +01:00
Laurent Rineau fc81d3bfec Merge pull request #3780 from afabri/CGAL-links-GF 
Some Documentation Fixes for Issue #3457
 2019-03-27 18:05:17 +01:00
Laurent Rineau e9f36ff557 Prepare for CGAL-4.14-beta4 2019-03-27 18:03:07 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Laurent Rineau 43d1948396 master now targets a possible CGAL-4.14-beta3 2019-03-13 17:15:45 +01:00
Laurent Rineau ca67ac5c1f Remove all mentions of BLAS, LAPACK, and TAUCS in our CMake scripts 2019-03-07 09:40:08 +01:00
Laurent Rineau 911e44a1fe Prepare for beta2 2019-03-04 18:35:48 +01:00
Laurent Rineau 01e5727a50 Prepare CGAL-4.14-beta1 2019-03-01 16:27:11 +01:00
Laurent Rineau 5199eb70ee Merge pull request #3283 from imiordanov/Periodic_4_hyperbolic_triangulation_2-IIordanov 
New packages: Hyperbolic_triangulation_2 / Periodic_4_hyperbolic_triangulation_2
 2019-02-22 16:39:12 +01:00
Andreas Fabri b84f54a9e3 Do not define the macro CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS for VC2013 as suggested in Issue #3436 2019-02-08 09:46:18 +01:00
Marc Glisse 34cbb9cd4b Make Epeck_d work & C++14-only cleanups 
Still some rough edges:
1) double tab[]={.1,.2,.3}; Point_d p(tab+0,tab+3); lazily stores
iterators to tab, so tab had better still be alive when we need
update_exact.
2) One functor (point on a sphere) cannot be done exactly exactly with
a representation center+squared radius.
3) Several hacks that make this not as generic as it should be.
 2019-02-03 23:16:28 +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
Maxime Gimeno d52718f312 Fix Conflicts 2019-01-21 10:03:31 +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
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 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +01:00
Sébastien Loriot e179770aab add skeleton for collision detection in PMP 2018-10-09 10:28:43 +02: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 ac173dfe44 Prepare CGAL-4.13 2018-09-12 11:07:03 +02:00
Laurent Rineau 17fc9631cf Prepare CGAL-4.13-beta2, if needed 2018-08-01 16:22:31 +02:00
Maxime Gimeno 8d0a67095f Merge branch 'master' into IntrinsicFaceGraph-V2 2018-08-01 15:40:36 +02:00
Laurent Rineau f1e926e689 Update <CGAL/version.h> (for full header-only) 2018-07-31 16:26:54 +02:00
Laurent Rineau 10a84aa34e Merge branch 'master' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-27 10:33:24 +02:00
Laurent Rineau c68cf8fc4c Merge pull request #3129 from sgiraudot/Point_set_processing-Callbacks-GF 
Point Set Processing: Callbacks
 2018-06-27 10:21:40 +02:00
Simon Giraudot 24ac59a01c Avoid using std::unordered_set for MSVC2013 as performances can be very bad 
See: https://medium.com/plaxis/embarrassingly-poor-performance-of-regular-point-sets-with-std-unordered-set-418cb413974b
 2018-06-21 16:11:03 +02:00
Maxime Gimeno 4e8264b109 Merge CGAL/master to get rid of the dependency to QGLViewer 2018-06-11 12:10:57 +02:00