Maxime Gimeno
2500331070
Merge remote-tracking branch 'cgal/master' into Demo-Add_dependency_to_qt5_moc_and_dependencies-maxGimeno
2021-02-09 12:33:52 +01:00
Maxime Gimeno
9cd0d450f9
Remove QDomElements and need for QtXml
2021-02-09 11:31:34 +01:00
Laurent Rineau
c5ba414c72
Merge pull request #5336 from maxGimeno/GraphicsView-Use_opengl_4_1_context-maxGImeno
...
Graphics_view: Upgrade glsl version in basic_viewer_shaders
2021-02-05 16:12:42 +01:00
Maxime Gimeno
dfc613c342
Add missing makeCurrent()
2021-01-21 10:22:51 +01:00
Maxime Gimeno
04753381e5
Rename file and add ::Qt
2021-01-12 13:22:34 +01:00
Maxime Gimeno
95192d6d4b
factorize context initialization
2021-01-12 13:08:58 +01:00
Maxime Gimeno
17e83d573d
Fix demos
2021-01-08 11:40:09 +01:00
Maxime Gimeno
bebd60c12b
Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno
2020-10-20 09:53:54 +02:00
Jane Tournois
5c8df6672a
remove CGAL_CFG_MATCHING_BUG_ variants
...
the "matching bug" of msvc has been fixed since at least vs 2015
2020-09-25 14:25:14 +02:00
Maxime Gimeno
9c15f2c9dc
Use FeatureSummary in the demo, and remove CGAL_FOUND
2020-08-04 12:46:17 +02:00
Dmitry Anisimov
ad813b4cb0
further removed result_of and result
2020-07-30 16:19:02 +02:00
Dmitry Anisimov
acdf4c6bee
circular kernel 3 result_of to decltype
2020-07-22 15:23:09 +02:00
Sébastien Loriot
0779373835
extra run of the script to remove tabs and trailing whitespaces
...
right after the merge of 4.14 release branch
+ manual fix on one line in:
* Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
* .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot
0a46621dc6
Merge branch 'cgal/releases/CGAL-4.14-branch'
...
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot
590612a563
run the script to remove tabs and trailing whitespaces
2020-03-26 13:25:16 +01:00
Laurent Rineau
2c5826dd6f
Merge pull request #4474 from sloriot/CGAL-warning_macro
...
Update warning macro usages
# Conflicts:
# Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
2020-01-17 16:29:49 +01:00
Laurent Rineau
b91c43ba54
Fix more occurrences of -Wstring-conversion (clang++)
2020-01-16 15:09:45 +01:00
Sébastien Loriot
b13e116919
Manual removal of license notice + fix SPDX flags
2019-10-19 17:00:08 +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
Sébastien Loriot
254d60f642
First pass on removing license notice in header for GPL files
2019-10-19 15:23:19 +02:00
Sébastien Loriot
7356421d80
introduce Commercial license SPDX tag
2019-10-19 12:15:19 +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
Maxime Gimeno
660ebe9e81
Add missing highp and remove unwanted highp
2019-08-05 14:16:02 +02:00
Sébastien Loriot
fbafb9d06f
fix remaining mismatches and fix bugs
2019-07-10 11:40:45 +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
Andreas Fabri
4581f1b7a8
Morte replacements
2019-06-05 08:39:55 +02:00
Laurent Rineau
5c2df203b4
Merge pull request #3943 from mglisse/Number_types-expression_templates-glisse
...
Misc fixes for expression templates
2019-05-23 08:50:17 +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
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
b8fe6b10ee
Merge pull request #3804 from afabri/CGAL_tests_must_not_include_basic-GF
...
Do not include <CGAL/basic.h>
2019-05-21 16:37:01 +02:00
Mael Rouxel-Labbé
2848158354
Fix typos
2019-05-20 08:54:04 +02:00
Marc Glisse
a676b75ca0
Misc fixes for expression templates
2019-05-17 19:48:41 +02:00
Laurent Rineau
9cbfcee84f
Merge branch 'master' into CGAL-Exact_algebraic-GF
2019-05-13 18:11:00 +02:00
Laurent Rineau
2f8eeb0db3
Fix the headers dependency-hell around gmpxx in Number_types
2019-05-09 15:05:23 +02:00
Sébastien Loriot
1398af1b0b
Merge remote-tracking branch 'cgal/master' into HEAD
2019-04-12 17:44:31 +02:00
Andreas Fabri
8a3c4389a4
Fix for Circular_kernel_3
2019-04-12 12:58:52 +02:00
Andreas Fabri
9a7c91c460
Compute_approximate_angle_3 exists already in the spherical kernel
2019-04-11 09:48:30 +02:00
Sébastien Loriot
1d908c1c0b
remove code for CGAL_INTERSECTION_VERSION 1
2019-03-29 13:28:32 +01:00
Sébastien Loriot
82c13e6e74
remove cpp11 workaround in kernel related packages
2019-03-29 10:41:50 +01:00
Andreas Fabri
a51fc12113
Fix Spherical_kernel_3
2019-03-26 11:46:12 +01:00
Laurent Rineau
8693f95dac
Merge pull request #3619 from albert-github/feature/bug_headers
...
Update of headers
2019-02-22 16:39:09 +01:00
Laurent Rineau
564e81ab2d
Merge pull request #3682 from afabri/Circular_kernel_3-cleanup_test-GF
...
Circular_kernel_{2,3}: Cleanup of examples and tests
2019-02-22 16:39:01 +01:00
Andreas Fabri
546388574d
Circular_kernel_3: Initialize data member
2019-02-19 14:44:11 +01:00
Laurent Rineau
c3b8d2c46f
Fix for the testsuite
...
In the testsuite, `test/Kernel_23/include` can be found as
`../Kernel_23/include`, whereas in the Git layout it is
`../../../Kernel_23/test/Kernel_23/include`.
2019-02-18 14:26:17 +01:00
Sébastien Loriot
246d89b91f
add missing upper case letters
2019-02-14 11:01:28 +01:00
Sébastien Loriot
59bc453b42
first batch of replacement for level 1 in classified ref man
...
command used:
grep -l "##" */doc/*/PackageDescription.txt | xargs sed -i -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Sébastien Loriot
90ad079eb4
use macro for subsections
...
command used:
grep -l "###" */doc/*/PackageDescription.txt | xargs sed -i -E 's/\#\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\#\s*$/\\cgalCRPSubsection{\1}/
2019-02-14 10:32:00 +01:00
Sébastien Loriot
42b9a0be04
fix level
2019-02-14 10:26:05 +01:00
Andreas Fabri
12732c3d5b
Circular_kerne_{2,3}: Cleanup of examples and tests
2019-02-13 17:12:11 +01:00
Andreas Fabri
7fc2b8e80e
Initialize data member; remove mutable
2019-02-12 17:29:30 +01:00
Andreas Fabri
14663ea7b4
A circular_arc constructed from 3 points is not _full
2019-02-11 15:22:17 +01:00
Andreas Fabri
d8bef63907
Do not initialize in the default constructor of circular_arc_3
2019-02-11 14:58:18 +01:00
Laurent Rineau
6ffd76a87e
Merge pull request #2792 from afabri/Intersections_3-Add_missing_do_intersect-GF
...
Intersections_3: Add missing do_intersect() overloads
2019-01-18 16:37:54 +01:00
Laurent Rineau
80717c6f41
Merge pull request #3406 from mglisse/cgal-public-dev/Number_types-boost_mp-glisse-2
...
Support Boost.Multiprecision
2019-01-18 16:37:49 +01:00
Marc Glisse
5445e1714d
Clamp value to [-1,1] before computing asin in approximate_angle().
2018-12-02 23:26:32 +01:00
Marc Glisse
cf2671a7d5
Revert Sebastien's patch to print stuff.
2018-12-02 23:12:01 +01:00
Maxime Gimeno
d6cfa1a868
Fix CMake warnings about CMP for Visual 2017
2018-11-21 16:17:39 +01:00
Sébastien Loriot
29c676c954
try to please testsuite
2018-11-20 18:57:05 +01:00
Guillaume Damiand
7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand
2018-11-05 07:32:58 +01:00
Sébastien Loriot
0685423ae8
update from cgal/master
2018-11-02 11:32:31 +01:00
Guillaume Damiand
92ba7fa6c9
Update minimum cmake required version in all CMakeLists.txt
2018-10-18 14:49:23 +02:00
Guillaume Damiand
0c2dcf7208
Re-add include({CGAL_USE_FILE} ) in each CMakeLists.txt where CGAL is used with some component.
2018-10-18 14:38:42 +02:00
Guillaume Damiand
0bd9088b5a
Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required.
2018-10-17 14:17:08 +02:00
Guillaume Damiand
7f09308d33
Remove all include_directories(BEFORE ../../include) in CMakeLists.txt
2018-10-17 13:07:22 +02:00
Marc Glisse
e58cc2c24b
Go through int for enum -> FT.
2018-10-15 17:12:45 +02:00
Sébastien Loriot
2f9408f867
rename link name to match package name
2018-10-08 10:28:55 +02:00
Sébastien Loriot
ea240cfac5
use \PkgXXX instead of \PkgXXXSummary
2018-10-08 10:28:44 +02:00
Sébastien Loriot
a2e8a1c68f
add the suffix Ref to doxygen link to reference
2018-10-08 10:26:56 +02:00
Maxime Gimeno
8ae27f4c9c
Fix Circular_kernel and PCA demo
2018-07-13 13:56:46 +02:00
Andreas Fabri
990a682798
Fix Circular_kernel_3 demo (CGAL_PI)
2018-05-23 16:21:57 +02:00
Maxime Gimeno
f22c2864a0
Put qglviewer in the namespace CGAL
2018-05-17 10:20:56 +02:00
Maxime Gimeno
6584abd90b
Use integrated qglviewer for 3D demos
2018-05-17 10:20:55 +02:00
Andreas Fabri
0d3ac75518
Introduce namespace Intersections
2018-05-04 08:57:56 +02:00
Andreas Fabri
f9dcc6f1a4
No need for do_intersect(Sphere/Line) in the Spherical_kernel_3 as it is already provided by the Linear_kernel
2018-05-04 08:57:56 +02:00
Laurent Rineau
0a74393dcf
Commit all new dependencies files
2018-03-06 18:44:48 +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
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
6ec4c12031
Do not use OpenGL directly, but only using Qt5 OpenGL classes
2017-11-28 17:58:12 +01: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
Sébastien Loriot
19adf3b05e
make the doc match struct/class with the implementation
2017-11-17 11:34:55 +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
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
Laurent Rineau
23da9c6a10
Fix warnings about policy CMP0011
2017-10-23 15:29:27 +02:00
Maxime Gimeno
5bd60dfa1e
Fix kernel demo for QGLViewer 2.7.0
2017-07-03 09:35:14 +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
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
c826500c7d
Merge pull request #1551 from mglisse/Number_types-gmpxx_coercion-glisse
...
Misc GMPXX fixes
2016-10-20 09:47:39 +02:00
Laurent Rineau
08126075a7
Merge pull request #1582 from afabri/Circular_kernel_2-ICL_variant_bug-GF
...
Circular_kernel_2: Add a dummy field to the variant to work around an ICL bug
2016-10-20 09:47:35 +02:00