Sébastien Loriot
b78217e7e9
fix conversion warning
2018-08-27 15:01:36 +02:00
Sébastien Loriot
8b9897c393
do not use c++11 features
2018-08-27 15:00:28 +02:00
Sébastien Loriot
b394525171
fix warning
2018-08-23 08:44:33 +02:00
Sébastien Loriot
47b758ff38
add an example showing how to dump into OFF visible facets of an alpha-shape
2018-08-20 10:26:37 +02:00
Sébastien Loriot
d05df530b3
Merge pull request #2658 from MaelRL/Periodic_3_mesh_3-Feature-MBogdanov
...
Periodic_3_mesh_3, new package
2018-07-25 18:55:12 +02:00
Maxime Gimeno
4ca9d8b83d
Fix Alpha Shapes 3 demo
2018-07-10 09:35:17 +02:00
Mael Rouxel-Labbé
7ea3a8044e
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-06-05 14:39:18 +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
887766a0e1
Postfix class names with _2 and _3 as they are different
2018-05-09 09:54:57 +01:00
Mael Rouxel-Labbé
a0427ec756
Fixed abusing Triangulation_cell_base_3 for Delaunay triangulations
...
TriangulationCellBase_3 does not request a circumcenter;
DelaunayTriangulationCellBase_3 does.
Delaunay_triangulation_3 only compiled because
Triangulation_cell_base_3 (and Triangulation_ds_cell_base_3 !)
provided circumcenter() operators and DT3 inherited T3's TDS.
- The circumcenter() functions are removed where they shouldn't exist
- DT3 uses DT_cell_base_3 as cell base instead of T_cell_base_3
- Concepts/Classes that supposedly only required TriangulationCellBase_3
and then built Delaunay triangulations with that (Alpha Shapes, etc.)
are upgraded to request DelaunayTriangulationCellBase_3 (anyway, it
wouldn't compile if you actually provided a model of
TriangulationCellBase_3)
- Fixed various wrong templates in classes/concepts such as
MeshVertexBase_3 not refining RegularTriangulationVertexBase_3
and (only in the doc) defaulting to Triangulation_vertex_base_3
- Removed the deprecated class (for 4+ years) T_cell_base_with_circumcenter
2018-04-26 13:21:53 +02:00
Mael Rouxel-Labbé
17d46e9211
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-04-26 11:55:17 +02:00
Mael Rouxel-Labbé
8646350d47
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-03-15 14:42:21 +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
Mael Rouxel-Labbé
c28e05be0c
Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
2018-02-23 12:50:06 +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
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é
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
Laurent Rineau
fe132099ad
Fix a merge error
2017-11-28 17:54:46 +01:00
Laurent Rineau
f5b5aead66
Remove direct use of the OpenGL API
...
We always use the Qt wrappers.
2017-11-28 16:07:37 +01:00
Mael Rouxel-Labbé
91ba96c71b
Fixed typo
2017-11-19 01:43:23 +01:00
Laurent Rineau
e3bc760374
Fix compilation
2017-11-17 15:17:19 +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
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
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
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
97e8ea1794
remove extra space
2017-11-12 10:17:51 +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
Mael Rouxel-Labbé
1fce05f81f
Doc fixes
2017-08-24 11:33:43 +02:00
Mael Rouxel-Labbé
3d63f86ae3
Minor doc fixes
2017-08-24 10:30:39 +02:00
Mael Rouxel-Labbé
d0318957f2
Fixed a bunch of Alpha shape 3-related headers
2017-08-23 17:16:07 +02:00
Mael Rouxel-Labbé
3640902c6f
Misc minor changes
2017-08-23 17:15:44 +02:00
Mael Rouxel-Labbé
16ce117040
Documented the fact that ExactComparisonTag cannot be used with periodic triangulations
2017-08-23 17:13:24 +02:00
Mael Rouxel-Labbé
dba83ba5bf
Fixed a few Alpha Shapes 2 headers
2017-08-23 16:40:55 +02:00
Mael Rouxel-Labbé
406f41af78
Added CGAL_DEBUG macro
2017-08-23 16:31:17 +02:00
Mael Rouxel-Labbé
63d293765f
Added an assertion to forbid using ExactComparisonTag with periodic triangulations
...
When we set the exact comparison tag to true, we use a lazy evaluation
of predicates and store pointers to the arguments of the predicates (that is,
pointer to points). However, the points are -- in the case of periodic --
only temporary objects and it is thus dangerous to take pointers to those
temporary values because the pointers quickly become invalid.
Thus, periodic triangulations are not allowed to use the exact tag.
A possible way to make it work is to define a small class:
Periodic_triangulation_with_stored_real_points that would inherit the base
(periodic) triangulation but store all the points of its simplices.
Then, the function point(face_handle, int) would return an entry of that
container, of which it would be safe to take a pointer.
2017-08-23 16:19:32 +02:00
Mael Rouxel-Labbé
e3d27128fb
Minor doc changes to Alpha Shapes 3
2017-08-23 11:10:12 +02:00
Mael Rouxel-Labbé
72908fc076
Readability changes in Alpha_Shapes_3
2017-08-23 11:04:21 +02:00
Sébastien Loriot
9bb2d4433f
Merge remote-tracking branch 'cgal/releases/CGAL-4.10-branch'
2017-08-04 13:37:58 +02:00
Maxime Gimeno
831f0239cb
Fix CMP0071 warning.
2017-08-03 10:38:19 +02:00
Mael Rouxel-Labbé
85b74fb3cc
Minor example improvements
2017-07-31 16:17:49 +02:00
Mael Rouxel-Labbé
fd1c9d5dfa
Added periodic weighted alpha shapes to the doc
2017-07-31 16:17:23 +02:00
Mael Rouxel-Labbé
8e12efbeae
Improved weighted periodic example
2017-07-31 15:30:42 +02:00
Mael Rouxel-Labbé
4a9ac3cd0c
Fixed 3D Alpha Shapes's Geomview output to work with all triangulations
2017-07-31 14:37:56 +02:00
Mael Rouxel-Labbé
e57e138e98
Formatting change
2017-07-31 14:37:56 +02:00
Mael Rouxel-Labbé
31c5540cd5
Added an example of Alpha Shapes 3D with a regular periodic triangulation
2017-07-31 14:37:39 +02:00
Mael Rouxel-Labbé
a1c57031ba
P3RT3 can now be used with Alpha Shapes 3
2017-07-31 12:52:22 +02:00
Mael Rouxel-Labbé
ca4776a49f
Minor doc fixes
2017-07-31 12:43:12 +02:00
Maxime Gimeno
29c55b8499
Fix misisng QMap in Alpha_shape_3 demo
2017-07-10 16:11:08 +02:00
Laurent Rineau
ab46739f07
Merge pull request #2213 from maxGimeno/Fix_demos_for_qglviewer2_7_0-GF
...
Fix demos for qglviewer 2.7.0
2017-07-10 15:00:09 +02:00
Maxime Gimeno
28d363d4aa
Fix misisng QMap in Alpha_shape_3 demo
2017-07-03 09:35:13 +02:00
Mael Rouxel-Labbé
b5892b5fbc
Reworded ExactAlphaComparisonTag warning
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
e8c3618123
Updated documentation with changes from 19ae790
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
68d3a3eabf
Modified the way weird point types are handled when ExactAlphaComparisonTag=true
...
Instead of requiring an implicit conversion, we require that Cartesian_converter
can convert from Traits::Point_23 to Exact_kernel::Point_23
Also it will not compile (static_assert) if this functor is not provided instead
of silently defaulting to ExactAlphaComparisingTag = false
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
85c75bce3b
Reworded the warning about ExactAlphaComparisonTag
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
1030445709
Fixed missing backticks in Alpha_Shapes_23's docs
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
1fc2282350
Fixed regular triangulation capitalization across CGAL
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
11786a7b90
Fixed minor mistakes from a rebase
2017-06-28 10:16:23 +02:00
Mael Rouxel-Labbé
7ce35c7538
Added point type to the doc of alpha shapes 2/3
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé
c0cd440956
Moved some doc for clarity
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé
781b26f20f
Document the fact that ExactAlphaComparisonTag only works for "nice" traits
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé
d67163dece
Various improvements to the Alpha_shapes_3 user manual
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé
6a6422073d
Fixed concept refinement relationships in Alpha_shapes_3 doc
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé
c765fbfda0
Clarified TDS concepts and models in alpha_shapes_3 doc
...
also removed mention of Regular_triangulation_euclidean_traits_3
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé
1b3a608b30
Fixed not getting Alpha shapes 2 predicates and constructions from Lazy alpha NT
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé
cdb447a22f
Use Kernel_traits<Traits::Pt> to deduce the kernel rather than Traits::Kernel
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé
4e4f1ed4c0
Avoided a default traits construction
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé
871cce116e
Removed Regular_triangulation_euclidean_traits_3 usage in Lazy_alpha_nt_3
...
Regular_triangulation_euclidean_traits are deprecated (and do not do anything).
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé
ff40039d79
Fixed some Bare_point / Weighted_point typedefs in Alpha_shapes_3
...
The triangulation defines those types, not the traits
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé
ea295a0ee4
Made some typedefs readable for people without a 30" screen (no real changes)
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé
38c212c521
Fixed test_fixed_alpha_shape_3 Point_3/Weighted_point_3 usage
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé
3b36c56137
Fixed TDS in test of Alpha_shapes_3 (Regular_tr must use regular cell_base)
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé
3e25674957
Weighted alpha shape traits are not based on RT_euclidean_traits anymore
...
Similarly to Regular_triangulation_euclidean_traits, the Kernel concept has now
absorbed all the functors that are needed by the alpha shape traits concept and
the weighted alpha shape traits can thus simply be empty shells.
2017-06-28 10:14:35 +02:00
Mael Rouxel-Labbé
7a7ac15f42
Fixed weighted Alpha_shapes_3 TDS construction
...
When weighted, Alpha_cell_base_3 must use Regular_triangulation_cell_base_3
as base
2017-06-28 10:14:35 +02:00
Laurent Rineau
0685006e33
Merge pull request #2081 from maxGimeno/Merge_3d_demos-GF
...
Polyhedron_demo: Add an Alpha_shape_plugin
2017-05-29 11:16:21 +02:00
Laurent Rineau
7e651b6b78
Merge branch 'releases/CGAL-4.10-branch'
...
Merges two pull-requests:
- 9384ff4 Merge pull request #2133 from maxGimeno/Fix_cmake_warning_CMP0053-GF
- 0005d61 Merge pull request #2132 from sloriot/Kernel-use_CGAL_compare
2017-05-24 17:45:58 +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
Mael Rouxel-Labbé
9cd0f31d71
Temporarily silenced weighted alpha shape traits depreciation warnings
2017-05-16 10:28:09 +02:00
Mael Rouxel-Labbé
cd2a562ffa
Fixed improper guards against the inclusion of deprecated headers
2017-05-16 10:17:41 +02:00
Maxime Gimeno
8f2cba74d8
Add an Alpha_shape_plugin
...
- Add a specific alpha_shape item and an alpha_shape_plugin.
- Add a creation of polygon_soup from alpha_shape_item
2017-04-26 16:38:48 +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
bbf430b0b1
Merge pull request #585 from afabri/Kernel-Weighted_point-GF
...
Introduce Kernel::Weighted_point_3 together with functors
2016-12-20 19:52:02 +01:00
Sébastien Loriot
632d1f368d
initialize pointers
2016-11-29 11:57:32 +01:00
Sébastien Loriot
4c5270752b
rename template parameter
2016-11-29 11:52:52 +01:00
Sébastien Loriot
c8117a76f4
replace static_vector by a small struct
2016-11-24 15:42:47 +01:00
Sébastien Loriot
810fbd323f
Use a static_vector instead of a shared_ptr<vector>
2016-11-24 11:50:42 +01:00
Sébastien Loriot
10dd2175ac
remove non-needed unsigned
2016-11-24 11:37:08 +01:00
Sébastien Loriot
6a0541ede3
remove extra character
2016-11-24 11:37:08 +01:00
Sébastien Loriot
bc85850104
use an optional for exact_nt
2016-11-24 09:51:04 +01:00
Sébastien Loriot
a46dfa29d0
avoid throwing an assertion
2016-11-24 09:45:45 +01:00
Sébastien Loriot
cf71b05937
add an overload of CGAL::to_double for Lazy_alpha_nt_3
2016-11-24 09:41:41 +01:00
Andreas Fabri
e5e0cdd5f9
fix a typedef
2016-11-22 17:48:53 +01:00
Andreas Fabri
ecf44b08d7
Take the Point type from the underlying vertex type
2016-11-22 16:09:08 +01:00
Andreas Fabri
9f96b59bb9
Take the type Point from the underlyinng triangulation
2016-11-22 16:08:19 +01:00
Andreas Fabri
e5219a1725
Take the type Point from the underlyinng triangulation
2016-11-22 16:07:51 +01:00
Andreas Fabri
47e373c299
typo
2016-11-22 16:06:58 +01:00
Andreas Fabri
d624271315
Remove usage of Regular_triangulation_euclidean_traits_3
2016-11-21 16:43:40 +01:00
Andreas Fabri
d35c6c913d
Use Weighted_point_mapper_3
2016-11-21 15:33:27 +01:00
Laurent Rineau
57f0b33eb6
Fix Alpha_shapes_3
...
Alpha_shapes_3 needs to know a lot about its template parameter `Dt`. To
simplify the code, I have chosen to make the typedef `Tr_Base` public in
3D Delaunay and Regular triangulations.
2016-11-18 17:36:50 +01:00
Andreas Fabri
92406379e7
Add typename (Who removed them???)
2016-11-03 13:10:00 +01:00
Andreas Fabri
54ec8f9d92
the VC++ testsuite should pass now
2016-11-03 13:06:02 +01:00
Laurent Rineau
9a0bb54922
Merge pull request #1438 from sloriot/CGAL-clean_up_projects_name_cmake
...
Clean up projects name in cmake scripts
2016-10-05 13:02:25 +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
Andreas Fabri
f5da4d8f29
Add a link to the dD alpha complex offered by GUDHI
2016-09-07 17:37:18 +02:00
Guillaume Damiand
8ac37cc7df
Add missing link with glu in demo.
2016-06-02 12:25:39 +02:00
Guillaume Damiand
10469f9c4e
Update with master
2016-05-25 10:58:55 +02:00
Maxime Gimeno
524a8da107
Remove glu from all the CMakeLists
2016-04-14 09:29:50 +02:00
Sébastien Loriot
4c29bf1b44
CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR
2016-03-24 16:33:46 +01:00
Clement Jamin
f2c68b25cd
Update CMakeLists.txt of all demos for header-only mode
2016-03-09 17:23:20 +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
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
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
Maxime Gimeno
552aaa159f
Fix for the context
2016-02-09 14:48:26 +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
66a215a6ac
files in dont_submit do not exist
2015-12-31 16:26:03 +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
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
Laurent Rineau
7ddefbdcc8
Merge pull request #297 from afabri/CGAL-assert-GF
...
assert() should not be used in CGAL headers!
2015-09-07 10:58:20 +02:00
Andreas Fabri
1e2ff1131e
assert -> CGAL_assertion
2015-08-27 16:51:55 +02:00
Maxime Gimeno
a3addbfd9b
Fix
...
- Polyhedron : spaces in a shader made it invalid
- Circular Kernel : green intersection spheres are back : wrong attribute in the draw function
- Alpha Shapes : "in" remained in the shaders.
2015-08-14 13:56:43 +02:00
Maxime Gimeno
95f87a3ac5
Depth test problem fix
...
- Calling glEnable(GL_DEPTH_TEST) in the beginning of every draw should solve this problem.
2015-08-13 14:08:12 +02:00
Maxime Gimeno
7d220d3da8
Context 3.3 Core changed into 2.1
2015-08-10 08:59:54 +02:00
Laurent Rineau
55c30d0808
Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only
2015-08-04 10:55:26 +02:00
Laurent Rineau
cb0bdd3ad2
Remove warnings about unused moc files
...
Should fix #194 .
2015-08-03 16:27:28 +02:00
Laurent Rineau
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +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
Andreas Fabri
2289e5a2af
static_ccasts
2015-07-09 13:05:22 +02:00
Maxime Gimeno
278e9d9829
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
...
Conflicts:
Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
2015-07-08 12:40:14 +02:00
Maxime Gimeno
f76bb19734
Windows fix
...
- add an attribute at the application in the main() function
- add a custom context to the viewer
2015-07-08 12:16:51 +02:00
Sébastien Loriot
1d4358e052
update qt urls
2015-07-08 09:48:45 +02:00
Sébastien Loriot
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
Laurent Rineau
517588ebfc
Re-add removed files
...
Partially revert "Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF"
This reverts partially commit ed3298ee2f , reversing
changes made to ba4ede5f50 .
2015-07-07 16:19:16 +02:00
Maxime Gimeno
e12b46d285
Supposed to make windows able to run this demo
...
- Add setAttribute() to use desktop OGL in the main function
- create a specific context in the Viewer's creator
2015-07-07 15:56:51 +02:00
Laurent Rineau
b80a4b6557
Re-add a removed file
...
Partially revert "Merge and new plugin fixes"
This reverts partially commit
8ab112f5bd . Only the removal of
Alpha_shapes_3/test/Alpha_shapes_3/data/fin is reverted.
2015-07-07 13:50:07 +02:00