Commit Graph

406 Commits

Author SHA1 Message Date
Andreas Fabri 5efce459da Mesh_3 2018-01-18 08:49:52 +00:00
Andreas Fabri e34529aa9a PSP 2018-01-17 21:17:51 +00:00
Andreas Fabri 2e14ff9f04 Kernel 2018-01-17 19:59:11 +00:00
Andreas Fabri 43d2ecb521 Triangulation_3 2018-01-17 16:57:46 +00:00
Andreas Fabri fb51a69c7c Mesh_2 2018-01-17 16:50:21 +00:00
Andreas Fabri 6c791f161a Triangulation_2 2018-01-17 16:12:12 +00:00
Andreas Fabri 6cc385c6ec Number_types 2018-01-17 15:47:18 +00:00
Andreas Fabri cbf3a16471 libs compile without warning 2018-01-17 15:02:32 +00:00
Laurent Rineau 4b3244384f Merge pull request #2695 from sgiraudot/Point_set_shape_detection-Introducing_callbacks-GF
Shape Detection: Add Callback Mechanism
2018-01-17 10:42:41 +01:00
Laurent Rineau e8fca04385 Merge pull request #2691 from lrineau/Installation-fix_Boost_thread_required_or_not-GF
Installation: fix the detection of C++11 and the need for Boost Thread
2018-01-17 10:42:09 +01:00
Simon Giraudot d1179b5b04 Add cpp11::function (using either std::function or boost::function) 2018-01-12 09:54:14 +01:00
Mael Rouxel-Labbé b8df8ba29b Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-01-08 10:44:01 +01:00
Laurent Rineau fa9f256781 Fix the use of __has_cpp_attribute
When =std=c++03 is used, `__has_cpp_attribute(something)` still returns
non-zero for valid C++11 attributes.

See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81513
2018-01-04 11:47:13 +01:00
Sébastien Loriot e318a89a78 handle CGAL_GIT_HASH and CGAL_RELEASE_DATE in version.h 2018-01-03 11:13:19 +01:00
Laurent Rineau e80136e750
Merge branch 'master' into Aos_2-surface_sweep-efif 2017-12-07 15:00:47 +01:00
Efi Fogel f1483cfa25 Merge branch 'Aos_2-surface_sweep-efif-old' into Aos_2-surface_sweep-efif
Merging Sebastien's fix to the surface-sweep cod.
Also, replaced all occurrences of '_SL_' with '_SS_'.
2017-12-07 15:56:00 +02:00
Mael Rouxel-Labbé 379b7a76fb Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-12-07 12:10:53 +01:00
Laurent Rineau 6018fd55ec Add SPDX-License-Identifier 2017-12-06 13:10:11 +01:00
Laurent Rineau 777717ba7e Move config/ to cmake/modules/config/
That way, the directory will be installed along with CMake modules.
2017-12-06 12:53:05 +01:00
Mael Rouxel-Labbé 34d53aa2d9 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-12-05 20:32:30 +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
Mael Rouxel-Labbé dabb8d9df4 Aligned P3M3 license file (apply a89784027b) 2017-12-05 17:14:00 +01:00
Mael Rouxel-Labbé ba3a59ed5a Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-11-30 15:54:00 +01:00
Efi Fogel 3b2110656e Renamed sweep_line to surface_sweep 2017-11-29 21:48:38 +02:00
Laurent Rineau 28bd89af65 Fix a stupid typo 2017-11-28 10:24:13 +01:00
Laurent Rineau 9eb2e30745 Deal with the macro CGAL_TEST_SUITE in header-only 2017-11-23 17:06:46 +01:00
Laurent Rineau a2a5ca91a1 Unify CGAL_HEADER_ONLY and CGAL_HEADER_ONLY_STEP_2 2017-11-23 17:06:46 +01:00
Efi Fogel 7936109c6c Merge branch 'Aos_2-surface_sweep-efif-old' into Aos_2-surface_sweep-efif
Conflicts:
	.travis.yml
	.travis/packages.txt
	Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
	Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h
	Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_batched_pl_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_construction_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_insertion_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_overlay_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_vert_decomp_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_batched_pl_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_construction_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_insertion_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_overlay_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_batched_pl_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_construction_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_insertion_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_overlay_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_vert_decomp_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_default_planar_topology.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_basic_insertion_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_batched_pl_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_construction_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_default_overlay_traits_base.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_insertion_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_no_intersection_insertion_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_subcurve.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_vert_decomp_ss_visitor.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h
	CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp
	Documentation/doc/Documentation/dependencies
	Installation/include/CGAL/config.h
	Snap_rounding_2/include/CGAL/Snap_rounding_2.h
	Surface_sweep_2/examples/Surface_sweep_2/CMakeLists.txt
	Surface_sweep_2/include/CGAL/Surface_sweep_2/No_intersection_surface_sweep_2_impl.h
	Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_event_base.h
	Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_utils.h
	Surface_sweep_2/include/CGAL/Surface_sweep_2_algorithms.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_event.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h
	Sweep_line_2/include/CGAL/Sweep_line_empty_visitor.h
2017-11-16 16:31:52 +02:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Sébastien Loriot 31513a1f58 add missing PMP subpackage 2017-11-15 22:58:33 +01:00
Laurent Rineau d3cc5ee30d Bump CGAL/version.h to 4.12-dev 2017-11-13 15:11:59 +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 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
Mael Rouxel-Labbé 1f4475d471 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-10-27 16:26:27 +02:00
Laurent Rineau 75e61a8eb9 Merge pull request #2471 from jubalh/master
Include OpenGL ES for arm
2017-10-13 16:53:44 +02:00
Laurent Rineau 05a3370ad3 Rename to <CGAL/functional.h> 2017-10-04 16:32:11 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Andreas Fabri 2c2e26f07e Include CGAL/unary_function.h 2017-10-04 13:36:00 +01:00
Michael Vetter 154c48e8e3 Include OpenGL ES for arm
If we compile CGAL with having Qt present on arm, Qt will use OpenGL ES
headers. But CGAL/gl.h includes specifically include <GL/gl.h> which are
the desktop headers. They cannot be mixed.
2017-09-27 15:59:28 +02:00
Laurent Rineau f8c5efb9e3 Merge pull request #2373 from sgiraudot/Classification-GF
Classification (new package)
2017-09-22 15:18:52 +02:00
Laurent Rineau 037cba3fae Merge pull request #2336 from maxGimeno/Detect_features-GF
PMP: Detect features
2017-09-18 14:29:55 +02:00
Simon Giraudot 38663431a1 Merge branch 'Classification-GF-old' into Classification-GF 2017-09-11 11:53:13 +02:00
Laurent Rineau fda741e038 Merge pull request #2259 from efifogel/Set_movable_separability_2-tau
new package: 2D Movable Separability of Sets (2D Casting)
2017-09-08 17:40:40 +02:00
Simon Giraudot 97aefb29b6 Add license for Classification 2017-08-28 10:18:53 +02:00
Sébastien Loriot a89784027b update files 2017-08-24 14:19:56 +02:00
Sébastien Loriot f51f0cba1a update messages 2017-08-24 14:19:29 +02:00
Sébastien Loriot 7c6f6fc966 generate license files 2017-08-23 09:22:05 +02:00
Sébastien Loriot 1035aa802e display the name of the macro in the error and warning messages
this eases the creation of license.h file
2017-08-23 09:21:29 +02:00
Sébastien Loriot ab56ebb4e6 make PMP subpackage license file generated 2017-08-23 09:19:10 +02:00
Sébastien Loriot 1499c794a7 Add license include directives 2017-08-18 09:08:18 +02:00
Maxime Gimeno 3f57e98386 Add license file 2017-08-07 12:20:50 +02:00
Mael Rouxel-Labbé b8de2148b2 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-07-28 11:41:58 +02:00
Laurent Rineau 8dfa4f4dc8 Fix link error of demo/Polyhedron, in Debug and CGAL_HEADER_ONLY 2017-07-27 17:28:21 +02:00
Laurent Rineau 931a0a2689 second fix for: Add hack in config.h for boost detection of CXX11 features with ICC 2017-07-11 11:59:40 +02:00
Laurent Rineau 33871eac4b fix: "Add hack in config.h for boost detection of CXX11 features with ICC"
We have to check `__GXX_EXPERIMENTAL_CXX0X__`.

The issue in Boost-1.53 is that the other macro
`__GXX_EXPERIMENTAL_CPP0X__` is checked instead.
2017-07-11 11:59:39 +02:00
Simon Giraudot 6bc9fb5852 Add hack in config.h for boost detection of CXX11 features with ICC 2017-07-11 11:59:18 +02:00
Efi Fogel d10ed5ad2c Introduced CGAL_CFG_NO_CPP0X_TEMPLATE_ALIASES and used it 2017-07-10 12:29:17 +03:00
Laurent Rineau b0336e6558 Workaround for https://svn.boost.org/trac10/ticket/12534
That is a workaround for the bug about the partial specialization of

    boost::is_enum<std::pair<T, U> >

being too late.

The bug has been in Boost-1.62 only. For that version (currently the
default version in Debian-testing), we include a header from Boost
container as soon as possible: in `<CGAL/config.h>`.
2017-07-07 11:23:21 +02:00
Laurent Rineau c4438a472b Merge branch 'master' into Aos_2-surface_sweep-efif 2017-07-05 15:39:09 +02:00
Laurent Rineau 4b2b272404 Fix the -fvisibility=hidden issue 2017-06-22 16:17:13 +02:00
Mael Rouxel-Labbé 7c014c9e27 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
Based on cgal-public-dev/Periodic_3_Regular...
  @ 7efd46f427580437943fa549bdbf1159f35b1edb
2017-06-16 11:21:52 +02:00
Laurent Rineau 5aabddcd24 Merge pull request #1807 from lrineau/Installation-catch_bad_include_path-GF
Fix #1790: detect -I .../include/CGAL
2017-06-13 10:18:36 +02:00
Laurent Rineau b7a1a40a64 Add a license+copyright notice 2017-06-12 17:53:34 +02:00
Mael Rouxel-Labbé b58cfe0895 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
Based on the P3RT3 branch
2017-05-29 10:15:19 +02:00
Efi Fogel 3e6de6b439 Renamed sweep-line to surface-sweep and cleaned up 2017-05-27 12:30:41 +03:00
Mael Rouxel-Labbé 7cef85e107 Improved deprecation_warning.h
-- Actually fail compilation even if CGAL_NO_DEPRECATION_WARNINGS is defined
-- An optional message can be passed through CGAL_DEPRECATED_MESSAGE_DETAILS
-- Print the replacement header in all cases, not just when warning about
   the deprecated header.
2017-05-16 10:17:41 +02:00
Laurent Rineau 97352da979 Fix CGAL_Core and CGAL_HEADERS_ONLY_STEP_2 2017-03-27 18:04:55 +02:00
Laurent Rineau 718512a7ba Handle <CGAL/compiler_config.h> for MSVC
Actually, in our testsuite results, no other compiler has any bug
detected by the `CGAL_CFG*BUG` macros.
2017-03-27 18:04:53 +02:00
Laurent Rineau 1f3ba3c7ab Improvements to CGAL_HEADER_ONLY
- Now `<CGAL/compiler_config.h>` is no longer used.
  - GMP and MPFR are assumed.
- `<CGAL/version.h>` is in the distribution.
2017-03-27 18:04:52 +02:00
Andreas Fabri c4f5122409 Undo the accidental switching on of CGAL_LICENSE_WARNING 2017-03-22 14:54:12 +01:00
Andreas Fabri 8186bf41ae Fix CGAL_pragma_warning for Visual C++ 2017-03-22 14:50:47 +01:00
Andreas Fabri cd7deb8577 License check for Corefinement and Distance 2017-03-22 12:32:43 +01:00
Andreas Fabri 774bdc4351 License check for Geometric Meshing and Hole Filling 2017-03-22 12:10:37 +01:00
Andreas Fabri 28da5ff545 Add license check files 2017-03-22 11:59:34 +01:00
Andreas Fabri fde105b437 License check for Predicates 2017-03-22 10:29:59 +01:00
Andreas Fabri 51bbe5d1f6 License check for Geometric Measures and Miscellaneous 2017-03-22 10:05:39 +01:00
Andreas Fabri d04b048aa9 License check for Connected Components 2017-03-22 09:21:27 +01:00
Andreas Fabri 44c1328f55 License check for Normal Computation Functions 2017-03-22 08:54:00 +01:00
Mael Rouxel-Labbé 3c645878b4 Added license file for P3M3 2017-03-17 12:22:31 +01:00
Simon Giraudot 1385d5fc9b Add macros with old versions of boost 2017-02-27 14:21:20 +01:00
Simon Giraudot 6525d58fbf Fix error (removed lines by mistake) in config.h 2017-02-27 10:03:51 +01:00
Simon Giraudot 588c8634b9 Add CGAL::cpp11::unordered_set/map using boost or std 2017-02-27 09:56:54 +01:00
Laurent Rineau 760076510c Merge pull request #1845 from lrineau/Mesh_3-fix_detect_features-GF
Various modifications of Mesh_3
2017-02-06 15:19:31 +01:00
Sébastien Loriot d1e777efaa rename file 2017-01-26 10:34:24 +01:00
Sébastien Loriot 69e16f9c42 no longer use release_date.h 2017-01-19 16:33:19 +01:00
Sébastien Loriot eefa67f762 remove release_date.h and put the macro in version.h to be set by cmake
in the case of a release, it will be the date of the creation of the release
2017-01-19 16:32:31 +01:00
Sébastien Loriot 06dbf4da5d license headers are LGPL 2017-01-19 15:20:27 +01:00
Sébastien Loriot 6405807260 generate license headers
using:
cd Installation/include/CGAL/license
cmake -P generate_files.cmake
2017-01-19 15:20:24 +01:00
Laurent Rineau 680210cab5 Improvements
- move `CGAL_WARNING` in `<CGAL/config.h>`,

- create the macro `CGAL_pragma_warning`,

- use `CGAL_pragma_warning` to simplify `<CGAL/license/lgpl.h>` and
  `<CGAL/license/gpl.h.in>`.

- add messages in `include/CGAL/license/generate_files.cmake`

- add test files, that do nothing but can be modified to check errors
  and warning.
2017-01-19 15:20:23 +01:00
Sébastien Loriot 57c662ea3b generate include/CGAL/license/package_list.txt
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 -n "$i "
  pn=`grep cgalPkgDescriptionBegin $i/doc/$i/PackageDescription.txt  | \
  sed 's/\\\cgalPkgDescriptionBegin{\s*//' | \
  awk -F "," '{print $1}'`; echo $pn;
done > Installation/include/CGAL/license/package_list.txt
2017-01-19 15:20:23 +01:00
Sébastien Loriot 281fcc52b5 fix header 2017-01-19 15:20:22 +01:00
Sébastien Loriot 1ef0791a15 license_check -> licence and lower case header 2017-01-19 15:20:22 +01:00
Laurent Rineau 53cac14b33 The new proposal, with a CMake script to generate header files
See Installation/include/CGAL/license_check/README.md
2017-01-19 15:19:47 +01:00
Laurent Rineau 5f1ee711a9 Extend CGAL_STATIC_THREAD_LOCAL_VARIABLE with 3 and 3 parameters 2017-01-19 13:10:40 +01:00
Laurent Rineau 6c77740485 CORE MemoryPool<T> has to be destroyed last
If Boost implementation of thread local storage is used, the order of
destructors is reversed, compared to C++11 `static thread_local`. The
solution for CORE `MemoryPool<T>` is to make the static variable a
static member of the class, and initialize the pointer only inside the
function. That ensures that the destructor will be called after the
destructor of local static variables.
2017-01-10 16:27:44 +01:00
Andreas Fabri adbc830e0f fix 2017-01-10 14:40:23 +01:00
Andreas Fabri 7b6e4a27ca Even read only static const variables must be thread local
as otherwise their destructor is called after the destructor
of the CORE memory pool.
2017-01-10 13:53:50 +01:00
Laurent Rineau 2a583bd7aa Proposal to fix #1790
If `.../include/CGAL` is in the INCLUDE path, that file will trigger an
error, instead of letting users have a bad include path.
2017-01-09 16:48:11 +01:00
Marc Glisse c58d0c319a Allow CGAL_EIGEN3_DISABLED to disable auto-detection of Eigen3. 2016-11-07 21:46:10 +01:00