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

4510 Commits

Author SHA1 Message Date
Jane Tournois 321e8293af
fix outdated code 
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
 2021-05-28 14:55:14 +02:00
Jane Tournois 525271c25e start by looking for TBB_ROOT (env or cmake variable) and TBB_DIR (cmake variable) 
and fix 2019 Update 5 version number
 2021-05-28 12:20:37 +02:00
Jane Tournois 8d4f14735b workaround a bug of earlier versions of TBB 
Laurent said :
"That is a bug in earlier versions of TBB. It was fixed in TBB 2019 update 5. That is a bad interaction with #5687, that made the module FindTBB.cmake from CGAL search for TBB in Config mode, first."
 2021-05-27 15:06:56 +01:00
Laurent Rineau 8fa0f55ac7
Merge branch 'master' into mt-glisse 2021-05-27 10:27:38 +02:00
Maxime Gimeno 523b54e4f7 Fix changes.md 2021-05-26 15:22:27 +02:00
Maxime Gimeno 553445a771 Changes after review 1 2021-05-26 11:16:09 +02:00
Maxime Gimeno 0e9d4bf956 Fixes in CMake 2021-05-20 12:17:48 +02:00
Maxime Gimeno 797c5ad08b Merge remote-tracking branch 'cgal/master' into PMP-compare_faces_from_meshes-maxGimeno 2021-05-20 08:58:24 +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 82bec8a1d6 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:11:37 +02:00
Laurent Rineau 8464338bb8 Merge pull request #5692 from maxGimeno/CGAL_cpp11_atomic_and_threads-maxGimeno 
CGAL:: Use std atomic and threads
 2021-05-19 17:10:29 +02:00
Laurent Rineau 4a2f016f6a Merge pull request #5617 from afabri/Nef_3-translation-GF 
Nef_3: Add Aff_transformation_3::is_translation()
 2021-05-18 18:14:17 +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
Laurent Rineau 9b7388c79d Merge pull request #5685 from maxGimeno/Testsuite-enlarge_tst_gmp_and_mpfr_dll-maxGimeno 
Testsuite: Fix gmp_and_mpfr_dll test
 2021-05-18 17:32:13 +02:00
Laurent Rineau 10efadb510 Merge pull request #5687 from maxGimeno/CMake-Fix_FindTBB-maxGimeno 
First search for TBB in config mode
 2021-05-18 17:32:11 +02:00
Laurent Rineau e0a4dd0680 Merge pull request #5677 from sloriot/CGAL-IO_namespace 
CGAL IO namespace

# Conflicts:
#	Installation/test/Installation/test_gmp_mpfr_dll.cpp
 2021-05-18 17:31:40 +02:00
Laurent Rineau 3b01cd01f1 Merge pull request #5685 from maxGimeno/Testsuite-enlarge_tst_gmp_and_mpfr_dll-maxGimeno 
Testsuite: Fix gmp_and_mpfr_dll test
 2021-05-18 17:06:59 +02:00
Laurent Rineau e25c58d180 Merge pull request #5687 from maxGimeno/CMake-Fix_FindTBB-maxGimeno 
First search for TBB in config mode
 2021-05-18 17:06:56 +02:00
Laurent Rineau fd59140b05 Merge pull request #5685 from maxGimeno/Testsuite-enlarge_tst_gmp_and_mpfr_dll-maxGimeno 
Testsuite: Fix gmp_and_mpfr_dll test
 2021-05-18 16:54:23 +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 b61f458cff USe the command 2021-05-11 14:56:16 +02:00
Maxime Gimeno 827a5ae8aa review 2021-05-11 14:40:40 +02:00
Maxime Gimeno dfab2a3d3c clean-up 2021-05-11 13:25:25 +02:00
Maxime Gimeno 889119e800 Update add_test to directly use msbuild when running on cygwin 2021-05-11 12:48:44 +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
Maxime Gimeno 74b3504879 First search for TBB in config mode 2021-05-06 14:41:08 +02:00
Maxime Gimeno fb5c4aa595 Fix test 2021-05-06 11:54:18 +02:00
Maxime Gimeno 95036f79d2 Add another pair of dll names to the gmp_and_mpfr_dll test 2021-05-06 11:29:39 +02:00
Maxime Gimeno 1c384dce6b Add another pair of dll names to the gmp_and_mpfr_dll test 2021-05-06 11:20:06 +02:00
Dmitry Anisimov 3c0fc281e8 more optimizations, using boost any and factoring out kd tree, adding metis check 2021-05-05 13:17:23 +02:00
Sébastien Loriot c863ee6754 fix check_headers compilation issues 2021-05-04 17:28:52 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +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
Guillaume Damiand 3aa8506a43 Merge branch 'master' into CGAL_data-gdamiand 2021-04-30 17:45:20 +02:00
Giles Bathgate 0ef8127c71 The CGAL_NOEXCEPT macro is no longer needed 2021-04-28 21:03:00 +01:00
Dmitry Anisimov a2f460c9d6 Merge branch 'master' into gsoc2019-PMPHDist-martinskrodzki 2021-04-27 18:37:32 +02:00
Andreas Fabri 24dd2aeca7 Add to CHANGES.md 2021-04-27 15:27:16 +01:00
Maxime Gimeno 21319d744a Remove target all_scene_items as it fails the building inside ctest on windows 2021-04-22 14:26:22 +02: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
Sebastien Loriot 77e5d1d26f
Merge pull request #4852 from JacksonCampolattaro/gsoc2020-Octree-campolattaro 
Add Octree Package
 2021-04-17 14:26:01 +02:00
Mael 8226666398
Merge branch 'master' into Triangulation_on_sphere_2-GF 2021-04-17 11:22:30 +02:00
Sébastien Loriot 39367c2313 Merge remote-tracking branch 'cgal/5.2.x-branch' 2021-04-17 11:14:29 +02:00
Sébastien Loriot cbd95907cd Merge remote-tracking branch 'cgal/5.1.x-branch' into HEAD 2021-04-17 11:11:28 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno 
Update maximum cmake versions
 2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Laurent Rineau a6a16d14ab Fix the bug on Windows 2021-04-08 17:53:41 +02:00
Sébastien Loriot d87f7d7703 use CGAL_ROOT 2021-04-08 09:44:19 +02:00
Simon Giraudot 10f6992b2a Rebase on master 2021-04-07 14:32:31 +02:00
Simon Giraudot 1c156ab22d Rebase on master 2021-04-07 14:27:57 +02:00
Mael Rouxel-Labbé a81e13a4f3 Update CHANGES.md 2021-04-07 10:13:50 +02:00
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
Maxime Gimeno 34e2180b22 rename match_faces 2021-04-01 13:50:41 +02:00
Simon Giraudot 616cd5a549 Apply corrections from review 2021-04-01 08:55:51 +02:00
Maxime Gimeno ca5867f172 Changes after review 2021-03-25 13:27:16 +01: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
Maxime Gimeno 836a7b8ae8 update CHANGES.md 2021-03-22 14:14:43 +01:00
Efi Fogel 30da4ebae2 Merge remote-tracking branch 'cgal/master' into Aos_2-boundary_objects-efic 2021-03-22 13:35:23 +02:00
Guillaume Damiand 751fb3851d
Merge branch 'master' into CGAL_data-gdamiand 2021-03-19 13:47:37 +01:00
Guillaume Damiand d140e5b89d Add CGAL::Data target; link exe with this target in the create_single_source_cgal_program function. 2021-03-19 13:45:04 +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
Guillaume Damiand 0939b0d1c6 Use target_compile_definitions instead of add_definitions 2021-03-16 11:32:03 +01:00
Guillaume Damiand 3557c614b9 Use CGAL_SOURCE_DIR instead of CMAKE_SOURCE_DIR 2021-03-16 10:57:49 +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
Efi Fogel 12a85a919b Merge remote-tracking branch 'cgal/master' into Aos_2-boundary_objects-efic 2021-03-01 15:39:36 +02: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
Marc Glisse 220d26da98 Merge remote-tracking branch 'cgal/master' into mt-glisse 2021-02-18 22:10:12 +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
Sebastien Loriot 913d6a608d
Update Installation/cmake/modules/CGALConfig_binary.cmake.in 
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
 2021-02-12 10:10:17 +01:00
Sébastien Loriot 6e3828f10c add in .in files 2021-02-12 08:44:14 +01:00
Sébastien Loriot 3cefeeb23c set CGAL_DATA_DIR in CGALconfig.cmake 2021-02-11 19:18:57 +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
Sébastien Loriot 422e0c30bb use string instead of char* 2021-02-05 09:12:06 +01:00
Sébastien Loriot fab5d071d8 add missing export 2021-02-04 19:45:23 +01:00
Sébastien Loriot 6e06ef17c6 global data path is used when building all tests/examples/demos 2021-02-04 19:01:51 +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
Sébastien Loriot a7ed934523 add missing quotes 2021-02-04 11:53:19 +01:00
Sébastien Loriot 1e60a142ce update default 2021-02-04 11:53:12 +01:00
Sébastien Loriot 6197135ba8 set CGAL_DATA_DIR for ctest and cmd files 2021-02-04 11:10:48 +01:00
Maxime Gimeno 61d3ce86d2 Fix qt5 installation test 2021-02-04 10:40:59 +01:00
Sébastien Loriot 93017e8d71 remove get_ prefix 2021-02-04 08:56:26 +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
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 afa51d77d7 Set CGAL_DATA_DIR in cmake (TODO: two default directories depending if we are in the flat release or not) 2021-01-19 15:23:48 +01:00
Guillaume Damiand b9cf04d1fa add function get_data_file_path() 2021-01-19 15:23:01 +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
Marc Glisse 9f0f7eb033 is_currently_single_threaded 2021-01-11 19:40:13 +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
Efi Fogel 6b64dc8def Merge branch 'master' into Aos_2-boundary_objects-efic 2020-11-11 09:38:55 +02: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
Sébastien Loriot 335ac3d5dd Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-10-20 13:32:03 +02:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +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
Jane Tournois 2bf4da4edc Merge branch 'master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF 
# Conflicts:
#	Installation/CHANGES.md
 2020-10-19 16:27:04 +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
Simon Giraudot d060301664 Update CHANGES.md 2020-10-19 08:06:23 +02:00
Laurent Rineau 9e96a45e55
Merge branch 'master' into AABBTreeC++11 2020-10-16 19:01:59 +02:00
Laurent Rineau 216d066285 Merge remote-tracking branch 'cgal/master' into Surface_mesh_reuse_garbage-GF 2020-10-16 14:01:58 +02:00
Laurent Rineau b4a536047d
Merge pull request #5060 from Vishal19111999/CGAL-Define_CXX20_master-Vishal19111999 2020-10-16 13:56:25 +02:00
Maxime Gimeno 9f74598459 Fix tests find_package 2020-10-16 10:37:26 +02:00
Maxime Gimeno 7bdc5d11a9 Post-review 2020-10-15 15:03:20 +02:00
Sebastien Loriot 1aab0c626a
Update Installation/CHANGES.md 
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
 2020-10-15 11:06:39 +02:00
Sébastien Loriot a5c8bebb09 update CHANGES 2020-10-14 18:07:44 +02:00
Maxime Gimeno 1df239ed11 restore WITH_cgal_lib as it is use din some tests and examples. 2020-10-14 11:57:43 +02:00
Maxime Gimeno 107c4350d0 remove all /src directories 2020-10-14 11:22:49 +02:00
Maxime Gimeno 0c14520987 Fix CGAL_Qt5 installation 2020-10-14 11:14:58 +02:00
Maxime Gimeno fcb6419106 WIP CGAL_qt5 2020-10-13 15:36:44 +02:00
Maxime Gimeno 27ddd9bf86 remove flags in CI 2020-10-12 15:44:44 +02:00
Maxime Gimeno 2ed89ef35e simplify CGAL_setup dependencies. 2020-10-12 12:24:13 +02:00
Maxime Gimeno 0f46df37df Restore GLOB 2020-10-12 11:11:04 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Maxime Gimeno 9883437315 revert the GLOB rework 2020-10-09 15:59:27 +02:00
Maxime Gimeno 3aa2f81ad9 test travis. 2020-10-09 15:08:09 +02:00
Maxime Gimeno 9a90628fa5 Fix header check 2020-10-09 14:29:40 +02:00
Maxime Gimeno fb39fc71ac Revert most changes to the cgal_use_file 2020-10-09 12:55:25 +02:00