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

4117 Commits

Author SHA1 Message Date
Laurent Rineau e4f1530590 This branch now targets 5.2.4 2021-07-06 13:53:39 +02:00
Laurent Rineau 94d1be2a79 Merge pull request #5768 from alefy/CMake-Fix_OpenMesh-alefy 
Set CMake imported OpenMesh library as INTERFACE
 2021-06-16 15:03:42 +02:00
Adrien Lefieux b6a34b2bc5 Set CMake imported OpenMesh library as INTERFACE 2021-06-08 16:53:13 +02:00
Laurent Rineau d99fa2517e Merge branch '5.1.x-branch' into 5.2.x-branch 2021-06-02 17:19:45 +02:00
Laurent Rineau 9e7d8abd8a Merge pull request #5732 from janetournois/Polyhedron_demo-fix_cmakelists_find_tbb-jtournois 
FindTBB.cmake: only search TBB in Config mode if version >= 2019 update 5
 2021-06-02 17:18:44 +02:00
Laurent Rineau 8b51a65ea0 This branch now targets 5.2.3. 2021-06-02 16:19:18 +02:00
Laurent Rineau 3cbadfb89b This branch now targets 5.1.5. 2021-06-02 16:02:44 +02:00
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 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 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 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 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
Sébastien Loriot cbd95907cd Merge remote-tracking branch 'cgal/5.1.x-branch' into HEAD 2021-04-17 11:11:28 +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
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
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
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
Maxime Gimeno 4ed3b0129c make the dependencies to boost general, not just for windows 2021-01-25 15:35:27 +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 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
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
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 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