Commit Graph

565 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Andreas Fabri 71ccb7d576 Add BGL as dependency 2018-05-23 11:48:59 +02:00
Andreas Fabri 6e828da0e9 Move stuff to CGAL/boost/parameter 2018-05-23 11:48:59 +02:00
Andreas Fabri f6cd1e0bcf Factorize boost parameters in the file CGAL/boost/parameter.h 2018-05-23 11:48:59 +02:00
Andreas Fabri f76575b587 To import the internal namespace parameters is a mistake 2018-05-23 11:48:59 +02:00
Laurent Rineau 05d7baceb1
Merge branch 'master' into Mesh_3-improve_polylines_to_protect-GF 2018-05-16 11:36:24 +02:00
Laurent Rineau ae0b45b79f Fix a compilation bug if Mesh_3 and Mesh_2 are both used
The conflict is withing the Boost parameters defined for Lloyd 2D and
Lloyd 3D.
2018-05-15 15:13:05 +02:00
Sébastien Loriot c2c2c1e498 improve phrasing 2018-05-11 23:06:40 +02:00
Sébastien Loriot 0b505bb746 remove unused figure 2018-05-11 23:04:39 +02:00
Andreas Fabri b4f16e759c Remove a redundant figure and add the word 'conforming' 2018-05-09 10:05:27 +01:00
Sébastien Loriot 01af331c72 use https for all links to www.cgal.org and doc.cgal.org 2018-03-14 15:59:38 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Andreas Fabri 4ef0bdbcb6 Suppress this warning not globally in disable_warnings.h 2018-01-24 14:21:16 +00:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Andreas Fabri fb51a69c7c Mesh_2 2018-01-17 16:50:21 +00:00
Laurent Rineau 1c2e9df8cf Merge branch 'releases/CGAL-4.11-branch' 2017-12-19 16:29:10 +01:00
Laurent Rineau 5181cd7474 Merge branch 'releases/CGAL-4.10-branch' into releases/CGAL-4.11-branch
# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
2017-12-19 16:19:22 +01:00
Jane Tournois c55d75ede8 sq_circumradius cannot be computed on an infinite facet
there was no need to check if a face is in domain, but we still need to check
whether it is infinite
2017-12-15 10:24:11 +01:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
2017-12-05 18:20:05 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Laurent Rineau a9365554c9 Merge pull request #2550 from sloriot/CGAL-add_SPDX_tags
Add SPDX License Identifier
2017-11-15 16:48:27 +01:00
Laurent Rineau 3ff09bc549 Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-15 16:47:42 +01:00
Jane Tournois e888bd46c1 the convergence criterion does not need to check "is_in_domain" for incident faces
anyway we do not compute the criterion for constrained vertices, nor for non-moving vertices
2017-11-13 15:31:36 +01:00
Jane Tournois e499208f5c add missing namespace 2017-11-13 15:27:07 +01:00
Laurent Rineau 86fb40832a Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF
Renew the handle of policies, for CMake-3.10
2017-11-13 12:01:39 +01:00
Laurent Rineau c6068691fa Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Sébastien Loriot a05b134a6b add SPDX identifier for files under the boost license 2017-11-12 10:17:50 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Laurent Rineau 488c3e2879 Merge pull request #2462 from sloriot/CGAL-fix_warnings_g++7
Fix some warnings
2017-10-13 17:04:02 +02:00
Laurent Rineau 00d444e84c Merge pull request #2462 from sloriot/CGAL-fix_warnings_g++7
Fix some warnings
2017-10-13 16:54:52 +02:00
Laurent Rineau c9cc90e630 Merge pull request #2467 from lrineau/Mesh_2-fix_clusters-GF
Mesh 2: fix clusters (issue #2456)
2017-10-11 19:14:33 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Laurent Rineau 81662e0c00 More Mesh_2 debug, for clusters 2017-09-26 15:13:53 +02:00
Laurent Rineau a2dd20af02 Bug fix
Fix #2456

When two clusters share a subsegment, the subsegment is split at its
middle, instead of using the length imposed by the clusters. If the
clusters were partially refined before that subsegment is split, one
must reset the clusters, because the minimal length may have changed.
2017-09-26 15:13:53 +02:00
Sébastien Loriot c3e7ade8b4 fix warnings 2017-09-25 09:09:54 +02:00
Maxime Gimeno 5ae96fc2aa Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found. 2017-05-23 16:12:56 +02:00
Laurent Rineau 3e5ed94661 Do check the dependencies of Mesh_2 2017-04-06 17:37:10 +02:00
Andreas Fabri 3112b11e67 Add license check; Add defines for test_lipschitz.cpp 2017-04-06 17:32:50 +02:00
Andreas Fabri dfb37af958 test dependencies in Mesh_2 2017-04-06 13:16:35 +02:00
Laurent Rineau af38caef16 Better CMake API for TBB
- new CMake module `CGAL_target_use_TBB` that defines a function, that
  enables TBB per target.
- `UseTBB.cmake` is deprecated.
2017-03-27 18:04:54 +02:00
Laurent Rineau a3ddaa132f Define and use a new CMake API for CGAL
For the moment, the new API is used only in:

- `examples/Mesh_2/CMakeLists.txt`
- `demo/Triangulation_2/CMakeLists.txt`
2017-03-27 17:23:26 +02:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Sébastien Loriot 19ab4c1907 fix non utf-8 character 2017-01-19 15:20:24 +01:00
Andreas Fabri f9ada57886 Mesh_2: Initialize to avoid warning 2016-11-14 09:14:30 +01:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 3f052834bd Split Mesh_2
There is a new `Mesher_level` package, that gathers the foundation
files (mesher levels and auxiliary files) for `Mesh_2`,
`Surface_mesher`, and `Mesh_3`.
2016-09-30 15:23:16 +02:00
Laurent Rineau 51f5697d3d Add missing #include 2016-09-30 15:23:14 +02:00
Laurent Rineau a59084cc79 Fix missing includes 2016-09-30 15:22:26 +02:00
Sébastien Loriot 7e2ee496de update project name of cmake scripts of tests 2016-09-08 00:26:37 +02:00
Sébastien Loriot e78bef8a9c update project name of demos 2016-09-08 00:13:34 +02:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Sébastien Loriot c869ee6855 update cmake scripts with at least one example requiring Core 2016-03-24 16:40:57 +01:00
Sébastien Loriot 4c29bf1b44 CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR 2016-03-24 16:33:46 +01:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Sébastien Loriot 2d191d6651 commit CMakeLists.txt for all examples and tests 2016-03-07 17:39:36 +01:00
Sebastien Loriot 807825109a Merge pull request #745 from afabri/Mesh_2-WunusedParameter-GF
Mesh_2 suppress an "unused parameter" warning concerning boost
2016-02-16 16:35:18 +01:00
Andreas Fabri aff5dbc5c9 check for boost version < 1.60 2016-02-15 19:15:06 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +01:00
Simon Giraudot 6607436610 Move #pragma at beginning/end of document 2016-02-05 15:32:19 +01:00
Andreas Fabri c473841ad2 suppress a warning 2016-02-05 14:59:10 +01:00
Sébastien Loriot 443b8cc2d7 precompute area functor 2016-02-01 10:23:29 +01:00
Sébastien Loriot 72c8aa7b05 make 2D-lloyd working with the projection traits 2016-01-29 15:16:51 +01:00
Sébastien Loriot 1fc7e45cde fix typo 2016-01-13 08:17:29 +01:00
Laurent Rineau 4638645a01 Merge PR #597 into Mesh_3-manifold_criterion-lrineau
Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Plugins/Mesh_3_plugin/Mesh_3_plugin_cgal_code.cpp
2016-01-08 17:41:02 +01:00
Sébastien Loriot e64ae35a6e Merge pull request #542 from bo0ts/Documentation-release_build2-pmoeller
Allow to build the documentation in a release
2016-01-07 09:21:46 +01:00
Laurent Rineau 3a4acc64de cleanup
Remove all directories and files listed in ./dont_submit. I have
verified that their usefulness is rather low.
2015-12-31 18:13:17 +01:00
Laurent Rineau e0f8f4f85f Refresh the branch Mesh_3-manifold_criterion-lrineau
For the moment, the manifold feature is no longer working.

Merge remote-tracking branch 'cgal-dev/Mesh_3-manifold_criterion-lrineau' into Mesh_3-manifold_criterion-lrineau

Conflicts:
	Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
	Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
	Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
	Polyhedron/demo/Polyhedron/Polyhedron_3.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
2015-12-18 14:55:20 +01:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Philipp Möller 81a8f982dc Handle the easy INPUT cases
If INPUT is just PKG/doc/PKG, handle it automatically.
2015-12-10 17:00:26 +01:00
Andreas Fabri 0e59c3488a 12 -> 8 2015-12-07 17:36:11 +01:00
Andreas Fabri dd17f1ad5d Set BOOST_PARAMETER_MAX_ARITY to the needed value in the concerned packages 2015-12-01 17:05:53 +01:00
Sébastien Loriot 6d5a92ebcb try to improve cgalRequires removal 2015-11-23 22:06:06 +01:00
Maxime Gimeno 7b4267c162 Replacement of cgalRequires
-fix for #291
2015-11-23 22:06:06 +01:00
Andreas Fabri 2ce8b07ec0 Define BOOST_PARAMETER_MAX_ARITY in <CGAL/config.h>
This macro has to be larger than the default value
and it must be set before including <boost/parameter.hpp>

Instead of setting it to 12 in the packages that
need it, we do this in <CGAL/config.h> and produce
an error if a user has set it to a value < 12
2015-11-16 11:21:31 +01:00
Sebastien Loriot 2e493f297b Merge pull request #389 from afabri/CGAL-Qt3-GF
Remove Qt3 based demos
2015-10-23 17:08:49 +02:00
Sébastien Loriot eb4f860f3b remove mentions of Qt3 2015-10-05 15:19:58 +02:00
Andreas Fabri 38d063539a cleanup 2015-10-02 08:17:19 +02:00
Guillaume Damiand cf1c0ea0ca Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin 2015-10-01 09:12:55 +02:00
Sébastien Loriot 50595505c4 Merge branch 'Fix_warnings-GF'
Fixes warnings in various packages

Successfully tested in CGAL-4.7-Ic-87
Approved by the release Manager
2015-07-17 14:21:21 +02:00
Sébastien Loriot d26e112cf4 fix warnings 2015-07-15 16:57:38 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
Jane Tournois 1de18c20a8 avoid returning a ref to temporary object 2015-06-01 14:50:51 +02:00
Jane Tournois 81d77803d3 avoid storing a std::pair
this is an attempt to fix the compilation error in the testsuite
for clang-6.0 and cpp11
2015-06-01 14:50:40 +02:00
Jane Tournois 90a2ba7345 avoid unused variable warning 2015-05-20 14:31:43 +02:00
Jane Tournois bcf4e13beb fix unused variable warning 2015-05-20 12:23:38 +02:00
Jane Tournois 717fa0a3fa fix doxygen warning 2015-05-19 10:02:28 +02:00