Commit Graph

998 Commits

Author SHA1 Message Date
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 cbf3a16471 libs compile without warning 2018-01-17 15:02:32 +00:00
Mael Rouxel-Labbé 1378280c79 Revert "Simplified typedef"
This reverts commit fecfaacbaf.

Although this typedef is still useless, it's useful to check the sanity of
the names of template parameters of the periodic traits classes. If some
template paremeters are named like typedefs of the kernel (which is valid code,
but not ideal) some compilers will bug and fail to compile.

See also commit cbde108708
2017-12-13 11:29:12 +01:00
Laurent Rineau 163a90b6c1 Fix `make install` in header-only
Now the Qt5 resources (qrc files, icons) are installed along with the
CMake modules.
2017-12-07 11:34:00 +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 fefc79dc17 Fix a warning about CMP0071 2017-12-04 11:33:55 +01:00
Laurent Rineau 3466eb83f0 Polyhedron demo: do not use the OpenGL API directly 2017-11-28 17:54:38 +01:00
Laurent Rineau 19c5502ca8 Fix compilation of demos in non-header-only
Now the variables `CGAL_Qt5_MOC_FILES` and `CGAL_Qt5_RESOURCE_FILES` are no
longer used by the definition of `CGAL_Qt5_extras`: other names are used.

`CGAL_Qt5_extras` is not supposed to be used directly by
users/examples/demos' `CMakeLists.txt`.
2017-11-22 12:45:21 +01:00
Andreas Fabri 021b340509 Fix CGAL_Qt5
In non-header-only, the resources and MOC files are added directly to
the CGAL_Qt5 library.
2017-11-22 09:59:52 +00:00
Laurent Rineau 891a83840e Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF 2017-11-17 15:03:57 +01:00
Laurent Rineau 25dffa1710 Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED 2017-11-17 12:54:13 +01:00
Laurent Rineau 21dabf1b1b Add compilation tests for demos 2017-11-16 18:45:33 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +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
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 ff26773f7b remove include directive for checking GPL compliance in LGPL headers 2017-11-12 10:21:35 +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
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
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
Mael Rouxel-Labbé fecfaacbaf Simplified typedef 2017-08-29 11:21:59 +02:00
Mael Rouxel-Labbé b36154cb7c Fixed P2DT2's traits class in demo 2017-08-24 15:08:28 +02:00
Mael Rouxel-Labbé dba83ba5bf Fixed a few Alpha Shapes 2 headers 2017-08-23 16:40:55 +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 d878561809 Merge pull request #2102 from afabri/Kernel_Weighted_point_without_conversion-GF
Remove implicit conversions between points and weighted points
2017-07-03 12:08:57 +02:00
Mael Rouxel-Labbé 1fc2282350 Fixed regular triangulation capitalization across CGAL 2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé 16392c92d1 Fixed bare_point / weighted_point issue 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 07cefea41f Generated random weights for random regular triangulations
building regular triangulations with non-uniform weights is slightly more
interesting
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé af6009f46a Fixed point types
Not that since Weighted_point_2 does not have a constructor with 3 FT (since
it makes it confusing with the homogeneous kernel), the random generator
generates weightless points...
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 9fbf2720ce Annihilated Regular_triangulation_euclidean_traits_23 across all packages
Left a little bit alive in the tests and in the Triangulation_23/doc
2017-06-28 10:15:30 +02:00
Laurent Rineau 4b2b272404 Fix the -fvisibility=hidden issue 2017-06-22 16:17:13 +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 2daba815b3 New way to use the CGAL_Qt5 extra files 2017-03-27 17:23:27 +02:00
Laurent Rineau fade4c0eb4 Fix CGAL_HEADER_ONLY 2017-03-27 17:23:27 +02:00
Laurent Rineau e9db872747 Simplify the CMakeLists.txt API even further 2017-03-27 17:23:26 +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
Laurent Rineau 429bfa4315 move the add_config_flag calls 2017-03-27 17:23:26 +02:00
Laurent Rineau 70e5a280f0 INSTALL use COMPONENT 2017-03-27 17:23:26 +02:00
Laurent Rineau ff15d0e5fc Simplify the CMakeLists.txt of our libraries 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
Laurent Rineau 26c803b6af Merge pull request #1574 from afabri/Filtered_kernel_init_double_to_avoid_warning-GF
Kernel_23: Initialize numbers in operator>>(istream&, Point/Vector/..)
2016-10-24 11:46:54 +02:00
Andreas Fabri e2e2df90c5 We initialize a point to quiet GCC6, although the bool first
should guaranteee that the equality test is only done after that
the point got assigned a value.
2016-10-18 09:25:06 +02:00
Andreas Fabri 76d751be01 Use CGAL_FALLTHROUGH 2016-10-17 13:45:42 +02:00
Sébastien Loriot ceba65b6c7 remove outdated file 2016-10-06 09:52:52 +02: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
Andreas Fabri 335a87df79 Fix package GraphicsView: include headers 2016-09-30 15:23:14 +02:00
Sébastien Loriot e78bef8a9c update project name of demos 2016-09-08 00:13:34 +02:00
Laurent Rineau 1cde972cdb Remove whitespace at end of lines 2016-06-29 11:04:29 +02:00
Laurent Rineau 2a59492fa9 Fix a bug also present in master 2016-06-29 11:04:09 +02:00
Guillaume Damiand 71d9047b87 Move add_definition before collect cgal library (bugfix) 2016-06-28 12:46:22 +02:00
Guillaume Damiand 6820e1b5c4 Reorder the cmake directive to retreive the same original order 2016-06-28 11:30:18 +02:00
Guillaume Damiand 061ffa6806 Remove a double QUIET 2016-06-24 18:57:23 +02:00
Guillaume Damiand f446cb9370 Remove some command unseless in header only 2016-06-24 14:37:38 +02:00
Guillaume Damiand e115fc07a1 Use install(DIRECTORY instead of file(glob following by install(files 2016-06-21 19:05:38 +02:00
Guillaume Damiand 1f40288aa3 Update cmakes in order to deal with install version of CGAL in header only mode. 2016-06-21 11:20:28 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Laurent Rineau a96ec65c54 Sort results of file(GLOB ...) to make build deterministic
Patch from Joachim Reichel <reichel@debian.org>, adapted from the flat
layout to the Git layout.

Fix #1048.
2016-05-06 16:50:16 +02:00
Andreas Fabri ab9d9255ae Read .poly files 2016-03-11 14:31:35 +01:00
Laurent Rineau 0ffa350ad7 Header-only big bluff!
One can set dependencies even without searching for them.
2016-03-09 18:53:59 +01:00
Laurent Rineau dd8d66ef96 Bug fix, fix a CMake error 2016-03-09 18:53:58 +01:00
Clement Jamin f2c68b25cd Update CMakeLists.txt of all demos for header-only mode 2016-03-09 17:23:20 +01:00
Laurent Rineau fd42bc1d15 Step 2
CGAL_ImageIO and CGAL_Qt5 are not even configured in header-only
mode. They will be configured later by `CGALConfig.cmake`.
2016-03-09 17:14:04 +01:00
Laurent Rineau 26db90214a Modification for CGAL_HEADERS_ONLY, step 1 2016-03-09 17:04:48 +01:00
Laurent Rineau 2bb72c7f26 Compatibility with QT_NO_KEYWORDS 2016-03-09 17:02:59 +01:00
Guillaume Damiand c623442071 Bug fix in CGAL_Qt5/CMakeLists.txt 2016-03-09 14:25:03 +01:00
Clement Jamin dd3ed5b07c Remove the "S" from HEADERS_ONLY 2016-03-09 10:58:55 +01:00
Clement Jamin 35a11c0e13 Use CGAL_HEADERS_ONLY everywhere 2016-03-09 10:56:11 +01:00
Clement Jamin c27ff9e85c Rename some cmake variables 2016-03-09 10:42:46 +01:00
Guillaume Damiand 78cde742ce Work on demo with qt5; ok for AABBtree (but need to be improved) 2016-03-09 10:35:22 +01:00
Guillaume Damiand ed2956eec2 Do not use qt5 module in header only mode 2016-03-09 10:31:17 +01:00
Guillaume Damiand 6d55c3b140 Do the target_link_libraries in all CGAL_XXX libraries only in non header only mode. 2016-03-09 10:22:43 +01:00
Maxime Gimeno b9856fe1a7 - fix MESA
Restoring the memory leak in order to keep the demo running on Mesa.
2016-02-17 15:18:11 +01:00
Sebastien Loriot 69ba6238a3 Merge pull request #764 from maxGimeno/Fix_For_761
Fix for 761
2016-02-16 16:21:56 +01:00
Maxime Gimeno 507fdc9f58 Fix the MemoryLeak 2016-02-12 09:26:32 +01:00
Laurent Rineau def3952e0e Merge pull request #767 from bo0ts/Documentation-no_internal_in_title-pmoeller
Remove internal release number from documentation title
2016-02-11 15:42:40 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +01:00
Laurent Rineau 8b22743b06 Merge pull request #766 from maxGimeno/LCC_Demo-MSAA_removal-GF
Removal of the MSAA in LCC

Conflicts:
	GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
	Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
2016-02-11 15:13:18 +01:00
Maxime Gimeno 9da8afe1f1 Removal of the MSAA in LCC 2016-02-11 14:27:44 +01:00
Maxime Gimeno 0a37521263 Revert "Fix for the context"
This reverts commit 552aaa159f.

Conflicts:
	Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
2016-02-11 14:16:04 +01:00
Sebastien Loriot 540a3700e7 Merge pull request #733 from maxGimeno/Graphics_view_demo-Pen_fix-GF
Graphics view demo pen fix
2016-02-10 10:41:19 +01:00
Sebastien Loriot ed557b907d Merge pull request #735 from maxGimeno/Surface_mesher_demo-Glu_removal-GF
Surface_mesher : Glu removal
2016-02-10 10:40:51 +01:00
Maxime Gimeno 552aaa159f Fix for the context 2016-02-09 14:48:26 +01:00
Maxime Gimeno 453708380b Fix for windows 2016-02-09 11:41:28 +01:00
Maxime Gimeno 49e5043f09 Replacing GL/gl.h by CGAL/gl.h 2016-02-08 08:53:45 +01:00
Maxime Gimeno b99c616c23 Re-implementation of opengl_check_errors 2016-02-05 08:36:54 +01:00
Maxime Gimeno 380bfc4504 Fix for the QPen 2016-02-04 09:30:00 +01:00
Maxime Gimeno e9e7ca0cf5 Fix for P2_T2 2016-02-03 16:03:11 +01:00
Sébastien Loriot e211843b4f Merge pull request #654 from maxGimeno/FixForMac-GF
Demo fix for OS X (fix for #437)
2016-02-03 14:39:48 +01:00
Maxime Gimeno 9f9e127aaa Addition of a QPen in SegmentGraphicsItem 2016-01-25 14:12:19 +01:00
Maxime Gimeno eb867bb810 Addition of a specific function for the MSAA in LCC 2016-01-20 14:35:00 +01:00
Maxime Gimeno 517ff8321a Fix for LCC_demo
- The setSamples(16) was causing a segfault. I moved it in the createOpenGLContext(). If the other demos performances are affected by this, a new function will have to be created.
2016-01-19 17:13:06 +01:00
Maxime Gimeno 0547f19d58 WIP A fix for mac
- repared the demo
- Disabled the splatting.
2016-01-19 10:28:05 +01:00
Sebastien Loriot 32a3972c33 Merge pull request #592 from afabri/CGAL-dont_submit_cleanup-GF
Towards getting rid of dont_submit files
2016-01-08 14:14:08 +01:00
Andreas Fabri 9b8da55bbf Remove lines with non-existing files 2015-12-31 17:27:27 +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 88c0db55ca Empty example paths should not result in warnings 2015-12-10 17:00:26 +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