Commit Graph

3966 Commits

Author SHA1 Message Date
Maxime Gimeno a357a90b1f Changes after review 2020-02-10 15:49:54 +01:00
Maxime Gimeno 4716359ca6 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-02-10 14:29:56 +01:00
Simon Giraudot 00b1f51b24 Move find_package() to function to avoid polluting global cmake variables 2020-02-10 11:57:56 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Laurent Rineau 97a8128f06 Merge pull request #4271 from maxGimeno/Installation-GMPXX-maxGimeno
Set GMPXX ON if detected
2020-02-07 16:25:11 +01:00
Laurent Rineau 541caf58cf Merge pull request #4330 from afabri/Spatial_sort-parallel-GF
Spatial_sorting: Parallelize Median Policy (2D & 3D)
2020-02-07 16:25:08 +01:00
Laurent Rineau 49a06e9201 Merge pull request #4362 from afabri/Box_intersection_d-accelerate-GF
PMP::self_intersections: Add Concurrency
2020-02-07 16:25:06 +01:00
Mael 5c9eb2fdfe
Update CHANGES.md 2020-02-07 11:10:15 +01:00
Mael 8ac61eae0d
Update CHANGES.md 2020-02-07 10:58:47 +01:00
Maxime Gimeno a3e60c8475 update CHANGES.md 2020-01-31 14:29:41 +01:00
Mael 6cd0be2707
Update changes.md 2020-01-29 16:49:52 +01:00
Maxime Gimeno 438826380d Clean-up after review 2020-01-28 10:44:36 +01:00
Maxime Gimeno 19a77a50ef Finish doc 2020-01-28 10:41:52 +01:00
Maxime Gimeno 1f0d062c10 Merge remote-tracking branch 'cgal/master' into PMP-Add_split_to_clip-GF 2020-01-27 12:51:26 +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
Simon Giraudot 5daa73c9bc Use CGAL_target_use_* mechanism for OpenGR and pointmatcher 2020-01-16 16:12:34 +01:00
Simon Giraudot 3cd8207f51 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-01-16 12:03:49 +01:00
Laurent Rineau 84cd4ee1fa Merge pull request #4370 from maxGimeno/Demo-Improve_3mf_detection-maxGimeno
Add PATHS to find_path 3mf
2020-01-15 17:32:07 +01:00
Laurent Rineau 67b1b0e04f Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand
Surface mesh topology (new package)
2020-01-15 17:24:06 +01:00
Laurent Rineau 631e383e20 Merge pull request #4132 from MaelRL/PMP-Remove_small_CCs
PMP: remove small connected components
2020-01-15 17:24:00 +01:00
Laurent Rineau c35c608021 Merge pull request #4370 from maxGimeno/Demo-Improve_3mf_detection-maxGimeno
Add PATHS to find_path 3mf
2020-01-15 17:23:55 +01:00
Simon Giraudot 9c81fcc61e Update CHANGES.md 2020-01-15 14:26:12 +01:00
Simon Giraudot 5beaa0c164 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-01-15 10:28:10 +01:00
Michel Zou 3b8d77aa8a version.h: workaround for SWIG parsing 2020-01-14 10:01:00 +01:00
Maxime Gimeno 283c4e67a5 Add CHANGES.md 2020-01-13 14:44:35 +01:00
Laurent Rineau eb9b8e6c52 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-01-10 15:28:14 +01:00
Laurent Rineau 0019db6076 Fix a bug introduced in CGAL-5.0
When CGAL is configured in non-header-only, and then installed, then
CGAL_Qt5 does not work, with a CMake error. Reported in StackOverflow:

  https://stackoverflow.com/q/59596301/1728537
2020-01-10 12:34:58 +01:00
Laurent Rineau 8dec83dcf1
Update Installation/cmake/modules/FindOpenMesh.cmake
Fix my previous commit.
2020-01-08 09:55:22 +01:00
Maxime Gimeno 2be81f7965 Add a name in FindGLPK.cmake 2019-12-30 16:41:01 +01:00
Guillaume Damiand 0b7ec2e216 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-20 10:02:23 +01:00
Sébastien Loriot fa0ffeaaed update CHANGES 2019-12-20 09:36:39 +01:00
Sébastien Loriot 15c14c0357 update CHANGES 2019-12-20 09:30:45 +01:00
Sébastien Loriot c328c66299 update CHANGES 2019-12-20 09:26:23 +01:00
Sébastien Loriot 87d2d83703 Merge remote-tracking branch 'cgal/master' 2019-12-20 09:24:41 +01:00
Maxime Gimeno 4c36c04fd6 Merge remote-tracking branch 'cgal/master' into Demo-Save_the_scene_entirely-maxGimeno 2019-12-19 11:26:55 +01:00
Laurent Rineau 03ea31e562 Better FindOpenMesh.cmake, compatible with the upcoming OpenMesh 8.1 2019-12-17 16:03:54 +01:00
Laurent Rineau 3ec3e4e9d4 Fix FindOpenMesh.cmake
```
CMake Error at C:/CGAL/test/CGAL-5.1-Ic-33/cmake/modules/FindOpenMesh.cmake:54 (set_target_properties):
  Property INTERFACE_LINK_LIBRARIES may not contain link-type keyword
  "optimized".  The INTERFACE_LINK_LIBRARIES property may contain
  configuration-sensitive generator-expressions which may be used to specify
  per-configuration rules.
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.1-Ic-33/BGL/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Release-64bits.gz
2019-12-17 15:17:07 +01:00
Maxime Gimeno c7c35c24f7 Remove remaining WITH_GMPXX in list 2019-12-16 09:37:52 +01:00
Maxime Gimeno 0783723f47 restore wrongly deleted lines 2019-12-16 09:30:54 +01:00
Maxime Gimeno 64bce3fd90 Remove tehe option WITH_GMPXX completely 2019-12-13 16:31:34 +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
Laurent Rineau 3a963288ef Merge remote-tracking branch 'cgal/master' into Installation-fix_check_of_documented_headers__for_5.1-GF 2019-12-09 15:23:22 +01:00
Laurent Rineau 8db15111a4 Merge branch 'releases/CGAL-5.0-branch' into Installation-fix_check_of_documented_headers-GF 2019-12-09 15:08:33 +01:00
Laurent Rineau 9149d26492 Fix check headers
Before this commit, headers with their own documentation pages, but
not referenced in other documentation pages, were not considered as
documented. This is a fix.
2019-12-09 15:07:10 +01:00
Guillaume Damiand 535fff1199 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-12-05 18:21:41 +01:00
Mael 7db5153f6d
Merge branch 'master' into PMP-Remove_small_CCs 2019-12-05 12:19:31 +01:00
Laurent Rineau 7aa90a3266 Fix CHANGES.md 2019-12-05 11:10:12 +01:00
Laurent Rineau d19f79ee0d Merge pull request #4163 from MaelRL/T2-Throw_on_collinear_strongly_intersecting_segments-GF
CDT2: Throw on constraint intersections that do not require constructions
2019-12-05 11:05:47 +01:00
Laurent Rineau 80ef3b832c Merge pull request #4175 from MaelRL/PMP-Stitch_borders_returns_number_of_stitched_pairs-GF
PMP: stitch borders returns number of stitched pairs
2019-12-05 11:05:44 +01:00
Laurent Rineau 0fa0c4fbb9 Merge pull request #4244 from maxGimeno/AABB_tree-Make_accelerate_distance_queries_default-maxGimeno
AABB_tree: make accelerate distance queries default
2019-12-05 11:05:35 +01:00
Laurent Rineau 0ea4cf4054 Merge branch 'releases/CGAL-5.0-branch' 2019-12-05 11:04:14 +01:00
Laurent Rineau f67b017463 Merge pull request #4347 from sloriot/CGAL-license_issues
Fix license issues
2019-12-05 11:01:11 +01:00
Laurent Rineau 65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2019-12-03 19:18:15 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Mael Rouxel-Labbé 020aa0a404 Update CHANGES.md 2019-12-02 16:31:35 +01:00
Mael f01f25234b
Merge branch 'master' into PMP-Stitch_borders_returns_number_of_stitched_pairs-GF 2019-12-02 16:25:43 +01:00
Mael Rouxel-Labbé cb813a5b49 Update CHANGES.md 2019-12-02 16:24:41 +01:00
Simon Giraudot dd43f1c262 Clean CHANGES.md 2019-12-02 16:10:28 +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 585bb8c7d6 fix license issues 2019-11-07 06:22:28 +01:00
Laurent Rineau e10ace6bcf Merge pull request #4334 from sloriot/CGAL-SPDX_cleanup_fixes
Fix some remaining license notice + add a missing LicenseRef-Commercial
2019-11-06 17:45:23 +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 bc735b44a0 Check the presence of <CGAL/Qt/*.h> header
When CGAL is installed by package-managers, CGAL_Qt5 headers maybe
installed separately:
  - `libcgal-qt5-dev` on Debian,
  - `CGAL-qt5-devel` on Fedora, for example.
2019-10-31 13:49:22 +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
Laurent Rineau 57152023c2 Merge pull request #4304 from MaelRL/CGAL-Header_only_doc_rewrite-GF
Documentation: switch manual to header-only by default (+misc improvements)
2019-10-29 15:23:39 +01:00
Laurent Rineau d24671eacf Announce the changes to the documentation 2019-10-29 15:04:55 +01:00
Laurent Rineau 9ae69bc85a Bump the Boost version number (and release month) 2019-10-29 15:02:01 +01:00
Mael ab65cc9800
Merge branch 'master' into PMP-Remove_small_CCs 2019-10-28 09:07:45 +01:00
Simon Giraudot c43c6ac2fa Merge remote-tracking branch 'clement/Faster_dd_spatial_searching-cjamin' into Faster_dd_spatial_searching-cjamin 2019-10-22 13:21:53 +02:00
Sébastien Loriot 0228f1e4ee update SPDX tag to use the original customer license
The license notice in the headers are not in the original headers
2019-10-20 10:43:11 +02:00
Sébastien Loriot 7c63219861 Manual removal of license notice + SPDX updates 2019-10-19 17:14:18 +02:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Mael Rouxel-Labbé defeee0d86 Merge branch 'CGAL-Header_only_doc_rewrite-GF-old' into CGAL-Header_only_doc_rewrite-GF 2019-10-19 13:06:45 +02:00
Sébastien Loriot 4788398628 add notice for commercial license 2019-10-19 12:23:05 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot d0f23b56f6 update deprecated 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-only/"
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-only/"
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-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.1$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.1$/SPDX-License-Identifier: LGPL-2.1-only/"
2019-10-18 22:08:05 +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 be0c21cfa4 Merge pull request #4280 from lrineau/CGAL-fix_CGAL_CreateSingleSourceCGALProgram-GF
Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others components
2019-10-18 14:17:15 +02:00
Laurent Rineau 95fecfc784 Merge pull request #4285 from lrineau/Installation-fix_CMake_scripts_for_installed_header_only-GF
Fix CMake scripts for installed header-only version of CGAL
2019-10-18 14:17:08 +02:00
Sébastien Loriot bbfb23181e pass on the doc 2019-10-17 15:02:47 +02:00
Laurent Rineau 5ad86b83c6 Merge pull request #4265 from lrineau/CGAL-really_header_only-GF
Do not require -DCGAL_HEADER_ONLY
2019-10-16 18:04:33 +02:00
Laurent Rineau ac1b7ec61a Fix CGAL_Qt5 in non-header-only 2019-10-16 18:02:26 +02:00
Laurent Rineau 2caae76bc5 Merge pull request #4262 from MaelRL/PMP-Fix_missing_images_and_history-GF
PMP (and changelog): Fix misc errors in 5.0-beta1
2019-10-15 16:34:11 +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 e496a5e679 Merge pull request #4280 from lrineau/CGAL-fix_CGAL_CreateSingleSourceCGALProgram-GF
Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others components

# Conflicts:
#	Scripts/scripts/cgal_create_CMakeLists
2019-10-15 16:33:17 +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 e6510c7b5c Merge pull request #4285 from lrineau/Installation-fix_CMake_scripts_for_installed_header_only-GF
Fix CMake scripts for installed header-only version of CGAL
2019-10-15 16:31:30 +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
Laurent Rineau 13bd01d38c Fix when CGAL_Qt5 is not available 2019-10-15 09:16:26 +02:00
Maxime Gimeno 856b7722f1 Remove extra S in macro 2019-10-15 09:03:13 +02:00
Laurent Rineau 24a099afc6 Fix CGAL_Qt5 in non-header-only 2019-10-14 11:24: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 ff9eaa41f0 Fix CGAL_Qt5_FOUND and other
When an installed header-only version of CGAL is used, and when all
`demo/*` are configured at once, then only the first demo got
`CGAL_Qt5_FOUND` correctly set.
2019-10-11 11:01:24 +02:00
Laurent Rineau 08a42cf35b Fix the detection of CGAL_ROOT
On Debian, CMake files are in
`/usr/local/lib/x86_64-linux-gnu/cmake/CGAL/` are our previous heuristic fails.
2019-10-11 11:00:29 +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 ac557caa4a Fix CGAL_CreateSingleSourceCGALProgram for CGAL_Core and others 2019-10-10 12:23:42 +02:00
Maxime Gimeno 5dd3c7ee83 Better test 2019-10-03 14:17:39 +02:00
Maxime Gimeno 60d3851a20 Set WITH_GMPXX ON if GMPXX is found in the cmake options of cgal 2019-10-03 13:35:35 +02:00
Laurent Rineau 030b4cf3a4 Whitelist more headers from Three
Without the uic-generated header, they cannot compile.
2019-10-02 11:31:45 +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 f46c9888e6 Mention header-only by default in the changes as well 2019-10-01 14:06:47 +02:00
Mael Rouxel-Labbé 6cbea89a69 Update CHANGES.md 2019-10-01 13:21:38 +02:00
Laurent Rineau 1c814f5e6c Changes proposed by Monique Teillaud 2019-10-01 11:01:04 +02:00
Mael Rouxel-Labbé 06360bc40b Fix changelog for ComputeApproximateAngle_3 and associated models 2019-10-01 09:32:40 +02:00
Mael Rouxel-Labbé b853219d12 Remove extra 'dihedral' 2019-10-01 09:15:31 +02:00
Maxime GIMENO 08696121e8
Update Installation/CHANGES.md
Co-Authored-By: Laurent Rineau <Laurent.Rineau@cgal.org>
2019-09-30 16:00:25 +02:00
Maxime Gimeno 546be7aff7 Add a `dry_run` parameter to `keep_large_connected_components()` 2019-09-30 15:49:36 +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 92e5b71e4d New proposal for CHANGES.md 2019-09-30 12:04:26 +02:00
Laurent Rineau e4cf45bf26 Let's be honest: the release will slip by a month 2019-09-30 09:47:29 +02:00
Laurent Rineau e3cadd8be5 Reformat CHANGES.md 2019-09-30 09:45:20 +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
Laurent Rineau a28d1554b3
FindTBB.cmake: read both TBBROOT and TBB_ROOT (#4252)
FindTBB.cmake: read both TBBROOT and TBB_ROOT
2019-09-27 16:17:28 +02:00
Maxime Gimeno 2473456405 update auto-link.h 2019-09-27 16:06:12 +02:00
Maxime Gimeno 718421b2b9 Add a line in the Supported Compilers about MSVC and CMake 2019-09-27 15:55:25 +02:00
Maxime Gimeno 58b647a1c1 Fix CGAL_TOOLSET for latest visual compilers. 2019-09-27 14:48:53 +02:00
Laurent Rineau 7e36ab1848 FindTBB.cmake: read both TBBROOT and TBB_ROOT
Fix #4240
2019-09-26 15:52:20 +02:00
Maxime Gimeno b1a8ec6d76 Add a way to upload a scene through ssh. 2019-09-26 14:57:22 +02:00
Maxime Gimeno 15d42d6cd2 Make the accelerate_distance_query() lazy and add a function to disable it. 2019-09-24 11:38:19 +02:00
Mael Rouxel-Labbé 6c9cd17d0f Some more documentation updates
+ master merge
2019-09-23 15:44:31 +02:00
Laurent Rineau df99307140 Merge branch 'releases/CGAL-4.14-branch' 2019-09-09 16:48:23 +02:00
Laurent Rineau 9abee11ee8 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-09-09 16:43:29 +02:00
Laurent Rineau 2a5b7cd7ba Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF
Fix CTest on windows
2019-09-05 14:59:38 +02:00
Laurent Rineau dc93527270 Merge pull request #4111 from lrineau/CGAL-fix_ctest_on_Windows-GF
Fix CTest on windows
2019-09-05 14:56:25 +02:00
Laurent Rineau 1ec8dc9db8 Remaining unregistered target 2019-09-04 14:19:54 +02:00
Laurent Rineau 94d654b9ab Fill CGAL_EXECUTABLE_TARGETS wherever that was missing 2019-09-04 14:19:54 +02:00
Laurent Rineau b8c7cb21bd Add a hook to track targets without dependent 2019-09-04 14:18:12 +02:00
Laurent Rineau f45c16f815 Add a new custom target ALL_CGAL_TARGETS to track all targets
That will include also targets with `EXCLUDE_FROM_ALL`.
2019-09-04 14:18:12 +02:00
Simon Giraudot fff368c351 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2019-09-02 09:46:54 +02:00
Laurent Rineau 5705b9da93 Fix CMake warnings (since 3.15) 2019-08-19 16:18:52 +02:00
Maxime Gimeno ba9adf4aa9 Fix typo 2019-08-16 13:08:00 +02:00
Maxime Gimeno 3513016dcf Updates for ctest with visual generator 2019-08-16 12:22:11 +02:00
Laurent Rineau 9efbeb3f3b Header-only: remove -isystem in the testsuite or dev-mode 2019-08-14 13:50:19 +02:00
Necip Yildiran e545f9ae5a Improved doc for OpenGR/pointmatcher wrappers; edited Installation/CHANGES.md 2019-08-14 00:06:09 +03:00
Laurent Rineau a0ea4f0c5f Merge branch 'releases/CGAL-4.14-branch' 2019-07-31 17:01:03 +02:00
Maxime Gimeno 69e5072cc1 Get rid of the two fake lines in ctest_testsuite 2019-07-29 13:35:19 +02:00
Laurent Rineau 7b1889b87e Merge branch 'releases/CGAL-4.14-branch'
# Conflicts:
#	Point_set_processing_3/include/CGAL/IO/write_ply_points.h
2019-07-26 18:45:17 +02:00
Laurent Rineau da2726e0e7 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch
# Conflicts:
#	CGAL_ipelets/include/CGAL/CGAL_Ipelet_base_v7.h
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Intersections_2/test/Intersections_2/test_intersections_2.cpp
#	Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/include/test_types.h
#	Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h
2019-07-26 18:33:55 +02:00
Laurent Rineau 4d5b4c950a Merge pull request #4085 from maxGimeno/Update_Find_TBB-GF
Update FindTBB.cmake
2019-07-26 18:27:00 +02:00
Laurent Rineau 5d47146cd6 Fix in header-only 2019-07-25 16:14:50 +02:00
Laurent Rineau fbf163d244 Fix when CGAL_USE_FILE is not included 2019-07-25 16:13:08 +02:00
Laurent Rineau a17c0d628d Fix our usage of TBB and <thread.h>
A lot of parts of CGAL use `<thread>` in conjunction with TBB. I have
added the `find_package(Threads)` in `CGAL_target_use_TBB.cmake` for
convenience.

I have also restored FindTBB.cmake as a pure copy of
  https://github.com/Kitware/VTK/blob/master/CMake/FindTBB.cmake
with that version:

> c7249fed2e73ce25fbbc53363d9caf4ab5cc9195
> Author: Cory Quammen <cory.quammen@kitware.com>
> Date:   Thu Feb 14 23:21:09 2019 -0500
>
>     FindTBB: handle basic linker scripts
>
>     TBB binaries may define libtbb.so as a linker script of the form
>
>     INPUT(libtbb.so.2)
>
>     Make FindTBB find the real .so file libtbb.so points to in such cases.
>
>     Approach borrowed from vtk-m/CMake/VTKmDeviceAdapters.cmake on
>     suggestion from Robert Maynard.
>
>
2019-07-24 10:35:36 +02:00
Sebastien Loriot 0dd30b1a68
Merge pull request #3900 from lrineau/CGAL-header_only_by_default-GF
Make CGAL_HEADER_ONLY the default in CGAL-5.0
2019-07-19 21:14:34 +02:00
Maxime Gimeno 82567685ad Add include of CGAL_taret_use_TBB in the end of the new FindTBB 2019-07-19 09:34: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 c411ae69d0 Merge pull request #2951 from kkatrio/PMP-smoothing-kkatrio
PMP: Mesh and shape smoothing
2019-07-18 16:49:05 +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 8adc64dfe3
Merge pull request #3860 from MaelRL/PMP-Add_non_manifold_vertices_collector-GF
PMP: Add function 'non_manifold_vertices'
2019-07-18 16:38:15 +02:00
Mael Rouxel-Labbé 047cfeb1fa Add namespace in CHANGES.md 2019-07-18 16:37:29 +02:00
Mael Rouxel-Labbé 18617dcf39 Modify changes.md 2019-07-18 16:28:56 +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
Maxime Gimeno 7f604308d0 Update FindTBB.cmake 2019-07-15 12:45:28 +02:00
Laurent Rineau 58e12565e3 Prepare release candidates for 5.0-beta1 2019-07-12 15:31:07 +02:00
Sébastien Loriot 4312b05ec1 fix function name 2019-07-12 06:26:40 +02:00
Mael 47c247ae72
Merge branch 'master' into PMP-smoothing-kkatrio 2019-07-10 15:36:25 +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
Laurent Rineau dc02598a5c Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand
CGAL: more viewers
2019-07-10 14:22:50 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau dee111bec5 Improve FindOpenMesh by adding an imported target 2019-07-05 10:35:56 +02:00
Simon Giraudot b2e723b548 Merge branch 'Faster_dd_spatial_searching-cjamin-backup' into Faster_dd_spatial_searching-cjamin 2019-07-04 13:17:50 +02:00
Maxime Gimeno f88d6111ce update CHANGES.md 2019-07-04 11:38:10 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau e79bfd5d03 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-03 11:10:03 +02:00
Maxime Gimeno 7155df2743 Merge remote-tracking branch 'cgal/master' into liangliang_master 2019-07-01 14:59:24 +02:00
Laurent Rineau 6639a69869
Merge pull request #4047 from sgiraudot/PSP-Spherical_queries-Update_changes-GF
Update CHANGES.md for PSP: Spherical Neighborhood Queries
2019-07-01 12:18:58 +02:00
Simon Giraudot f46751e487 Update CHANGES.md 2019-07-01 12:02:08 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Mael f40f8e4190
Merge branch 'master' into PMP-smoothing-kkatrio 2019-07-01 11:24:11 +02:00
Laurent Rineau 44e4d1526c Fix the CHANGES.md 2019-07-01 11:22:46 +02:00
Laurent Rineau 39a245220a Merge pull request #3660 from mglisse/NewKernel_d-lazy_Epeck_d-glisse
Epeck_d
2019-07-01 11:16:33 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +02:00
Laurent Rineau dbb1cb6c9b Merge pull request #3974 from afabri/Triangulation-add_ranges-GF
Triangulation_{2,3):  Add ranges
2019-07-01 11:16:05 +02:00
Mael Rouxel-Labbé 6a83f908e7 Align CHANGES.md with master 2019-06-28 17:43:09 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00
Laurent Rineau 5341998c7e Add a new ctest fixture, that checks the build system
That will avoid that `cmake` is run in parallel several times, when
`ctest -j` is used.
2019-06-28 12:53:53 +02:00
Mael Rouxel-Labbé 2729098c29 Update CHANGES.md 2019-06-26 08:42:23 +02:00
Liangliang Nan 655fa4b30d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-25 14:23:17 +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
Mael Rouxel-Labbé 7c82c96dfd Proper usage of CMake to find and use Ceres
done with the help of @lrineau
2019-06-21 11:24:32 +02:00
Guillaume Damiand fdc10c6e74 Merge branch 'CMap-path_isotopy-gdamiand' of github.com:CGAL/CNRS into CMap-path_isotopy-gdamiand 2019-06-20 16:52:15 +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
Guillaume Damiand c81464d2c0 Update CHANGES.md 2019-06-20 15:52:47 +02:00
Mael Rouxel-Labbé 0d1759e996 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-06-20 15:02:32 +02:00
Mael Rouxel-Labbé 7a5486962d Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-20 14:49:25 +02:00
Laurent Rineau 17add8332e Merge pull request #3903 from MaelRL/PMP-Generalize_keep_largest_CC-GF
PMP: Generalize `keep_large(st)_CCs`
2019-06-20 14:21:14 +02:00
Laurent Rineau 8fd3f2d8fd Merge pull request #3973 from sgiraudot/Kernel_23-Add_hash_functions-GF
[Small Feature] Add hash functions for kernel objects
2019-06-20 14:21:09 +02:00
Mael Rouxel-Labbé cad9a0aaa8 Make things work when Ceres is not available 2019-06-20 13:04:15 +02:00
Laurent Rineau 1bcaf6bbf3 Fix in non-header-only: one has to call find_package(Boost) 2019-06-20 11:57:37 +02:00
Laurent Rineau 2a5b558eb5 Merge branch 'master' into NewKernel_d-lazy_Epeck_d-glisse 2019-06-20 10:28:01 +02:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00
Liangliang Nan 4588ba5d9d Merge branch 'master' of https://github.com/CGAL/cgal 2019-06-19 15:08:53 +02:00
Liangliang Nan 010f05dfeb find GLPK
- added FindGLPK.cmake
- try to find SCIP first. If not, try to find GLPK
2019-06-19 15:02:27 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé 77711e4e71 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-06-19 11:34:48 +02:00
Mael Rouxel-Labbé 3b53ce20e3 Rename smooth/smooth_along_curvature_flow to smooth_mesh/shape
Also fix edge protection in the demo
2019-06-19 10:17:26 +02:00
Mael Rouxel-Labbé 22bd8a943b Merge smooth_areas and smooth_angles, rework AABB tree, document everything 2019-06-18 16:02:42 +02:00
Laurent Rineau e260ea1dd4 C++11: remove the need for Boost.Thread, even with CGAL_Core 2019-06-18 15:06:23 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Mael Rouxel-Labbé b1a37a0f1e Update CHANGES.md 2019-06-17 15:19:00 +02:00
Laurent Rineau 6842424fbd Make CGAL_HEADER_ONLY the default in CGAL-5.0 2019-06-17 15:06:57 +02:00
Laurent Rineau be0d07d150 Merge pull request #3979 from afabri/CGAL-null_ptr-GF
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-17 14:10:35 +02:00
Laurent Rineau e4353afb13 Merge pull request #3861 from MaelRL/PMP-Add_stitch_boundary_cycle_singular-GF
PMP: Introduce `stitch_boundary_cycle`
2019-06-17 13:54:39 +02:00
Laurent Rineau 395e4965b7 Remove use of qt5_use_modules (warned deprecated with CMake-3.14) 2019-06-14 15:15:40 +02:00
Liangliang Nan 92add3db18 Update list_of_whitelisted_headers.cmake
added
CGAL/SCIP_mixed_integer_program_traits.h
and
CGAL/GLPK_mixed_integer_program_traits.h
2019-06-12 21:21:55 +02:00
Mael Rouxel-Labbé bac2593797 Minor CHANGES.md changes 2019-06-07 10:40:53 +02:00
Liangliang Nan 7ac0565037 Added some "changes"
For the new package Polygonal Surface Reconstruction and the extension of Solver Interface
2019-06-06 10:53:48 +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
Laurent Rineau e4993273c5 Merge pull request #3864 from danston/Point_set_shape_detection_3-make_it_general_with_region_growing-danston
[Feature] Shape detection with region growing
2019-06-05 11:20:29 +02:00
Laurent Rineau 39c8f7ae1f Merge pull request #3950 from afabri/Triangulation_23-PointWithInfo-GF
2D and 3D Triangulations:  Unify insertion of range of points with info
2019-06-05 11:20:23 +02:00
Simon Giraudot 0a87e078b9 Add Sphere_3 to changes 2019-06-05 10:51:25 +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
Laurent Rineau d05de694ef
typo 2019-06-04 17:00:17 +02:00
Simon Giraudot 9ee478139b Remove hash for Direction_23/Ray_23 as equality is more complicated 2019-06-04 13:26:05 +02:00
Simon Giraudot 44907c8326 Update CHANGES.md 2019-06-04 10:42:23 +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
Laurent Rineau 5dc823d509 Merge branch 'releases/CGAL-4.14-branch' 2019-05-23 08:49:56 +02:00
Laurent Rineau 7be5e3fbe5 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-23 08:44:39 +02:00
Laurent Rineau c1a13a0a1e Merge pull request #3949 from lrineau/Installation-fix_ctest_for_Andreas-GF
Fix CTest CGAL tests when binary dir is a sub-directory
2019-05-23 08:31:44 +02:00
Simon Giraudot 69574884a0 Add changes about old PSP API removed 2019-05-22 11:14:32 +02:00
Andreas Fabri d318f1e938 Update changes.md 2019-05-22 11:08:37 +02:00
Laurent Rineau 268cb59ce1 Merge pull request #3739 from lrineau/Installation-remove_FindBLAS_LAPACK_TAUCS-GF
Remove support for BLAS, LAPACK, and TAUCS
2019-05-21 16:37:10 +02:00
Laurent Rineau 7e58feacfe Merge pull request #3797 from afabri/CGAL-Exact_algebraic-GF
Number_types:  Add Exact_algebraic
2019-05-21 16:37:07 +02:00
Laurent Rineau 3a9b2fe67f Merge branch 'releases/CGAL-4.14-branch' 2019-05-21 16:36:28 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00
Laurent Rineau 357fe1e486 Fix CTest CGAL tests when binary dir is a sub-directory
When the current binary dir is a sub-directory of the current sources
dir, then the recursive copy of the sources dir to `__exec_test_dir/`
cannot be done. In that case, do not setup the fixture
directory. Tests can still be run in the source directory (and pollute
it).
2019-05-20 12:18:18 +02:00
Laurent Rineau eeb32f50c3
Merge branch 'master' into PMP-Add_stitch_boundary_cycle_singular-GF 2019-05-20 11:55:38 +02:00
Mael Rouxel-Labbé 213222cc67 Modify CHANGES.md 2019-05-20 11:20:10 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Mael Rouxel-Labbé a120290675 Merge branch 'PMP-smoothing-kkatrio-old' into PMP-smoothing-kkatrio 2019-05-15 14:31:00 +02:00
Mael c53e7e2c68
Merge branch 'master' into PMP-Locate-GF 2019-05-15 07:59:52 +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
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00