0321e244b1
Merge branch 'Ridges_3-BGL-GF-old' into Ridges_3-BGL-GF
...
Conflicts:
Installation/changes.html
2015-06-08 14:36:15 +02:00
648ccb1510
CMake>=2.6.3 is required
...
I have tested: with CMake-2.6.2, there is a configuration error:
CMake Error: Error in cmake code at
/home/lrineau/Git/cgal/Installation/cmake/modules/CGAL_Macros.cmake:213:
Parse error. Function missing ending ")". Instead found left paren with text "(".
With CMake-2.6.3, that works.
2015-06-08 14:09:51 +02:00
1ce3c68ec8
Remove the -g flag in testsuites
...
While it might seem cleaner to simply add the -g0 argument, removing -g
is safer: -g0 would need to be added after any possible -g flags. Since
CMake makes no guarantees how the COMPILE_OPTIONS of a target are
actually initialized and we cannot change them on an individual basis
this is not easy to achieve. Hence we strip the CXX_FLAGS of -g. This
also still allows specifying it manually through CGAL_CXX_FLAGS.
2015-06-08 11:17:09 +02:00
c61663b6ca
Merge branch 'releases/CGAL-4.6-branch'
2015-06-05 16:45:53 +02:00
c2cd87865e
Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron
...
Conflicts:
Installation/changes.html
Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
Point_set_processing_3/doc/Point_set_processing_3/Point_set_processing_3.txt
Point_set_processing_3/doc/Point_set_processing_3/examples.txt
Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-04 11:27:56 +02:00
cb385a771b
Add -frounding-math for gcc 4 *and later*
...
Fix issue #104
2015-06-03 10:44:18 +02:00
d123ce5a47
Merge branch 'old/gsoc2014-Polyhedron_shortest_path-skiazyk' into gsoc2014-Polyhedron_shortest_path-skiazyk
...
Conflicts:
Documentation/biblio/geom.bib
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Documentation/doc/Documentation/packages.txt
Documentation/scripts/generate_how_to_cite.py
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-01 17:47:31 +02:00
ded08221ae
Update changes.html.
...
Rename Periodic_3_triangulation_traits_3
Periodic_3_Delaunay_triangulation_traits_3.
Rename the concept Periodic_3TriangulationTraits_3
Periodic_3DelaunayTriangulationTraits_3.
Create Periodic_3_triangulation_traits_3.
Create the concept Periodic_3TriangulationTraits_3.
2015-05-29 20:04:34 +02:00
35d0fe8f18
Merge remote-tracking branch 'cgal-dev/BGL-helpers-GF' into Ridges_3-BGL-GF
2015-05-27 18:16:11 +02:00
bc68b74fa8
update changes
2015-05-19 17:00:46 +02:00
48ad84344f
Recorded the changes in the 2D Minkowski sum package
2015-05-04 09:03:04 +03:00
7f3d6e35c5
Merging and integration of Polyhedron_Demo
...
- The Splatting has been deactivated
- The Scene_item class has a new member of type QOpenGLFunctions, allowing to use all shader functions without need for GLEW
2015-04-27 14:51:48 +02:00
ed3298ee2f
Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_selection_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
2015-04-27 08:50:06 +02:00
89348a1ab9
cut_plugin fixed
...
- replaced the missing modified files by the originals
- added a reference to a vector of floats in traits so that it fills it instead of drawing the bboxes
2015-04-24 15:59:23 +02:00
0657c51e75
Add change log entry
2015-04-24 09:11:52 +02:00
cec447468d
update changes.html
2015-04-24 08:58:01 +02:00
b0d5a2eac7
fix changes
2015-04-22 18:07:10 +02:00
faee08becd
Merge pull request #56 from efifogel/Aos-Polycurve_tests-wkhan
...
Aos polycurve tests wkhan
2015-04-22 18:00:03 +02:00
a0fcac7d94
Merge branch 'Spatial_sorting-spatial_sorting_on_sphere-pmachado' of git://github.com/sloriot/cgal into sloriot-Spatial_sorting-spatial_sorting_on_sphere-pmachado
2015-04-22 17:41:53 +02:00
3f9e312ad2
update changes
2015-04-22 10:35:26 +02:00
ae9da903ea
update changes.html
2015-04-17 11:50:06 +02:00
3f6c6b3369
Merge branch 'Generator-more_point_generators-pmachado' of git://github.com/sloriot/cgal into sloriot-Generator-more_point_generators-pmachado
...
Conflicts:
Generator/doc/Generator/Generator.txt
Generator/doc/Generator/PackageDescription.txt
Generator/doc/Generator/examples.txt
Installation/changes.html
2015-04-15 16:25:34 +02:00
fe203e8f78
update changes
2015-04-15 16:21:43 +02:00
4a7a614e5d
Allow to find QGLViewer-qt5_
...
Conflicts:
Installation/cmake/modules/FindQGLViewer.cmake
2015-04-03 12:35:37 +02:00
4eef28be7e
Minimal version of Boost: 1.48
2015-04-01 17:31:17 +02:00
7d4da6aee2
Add new additional versions of Boost (up to 1.69)
2015-04-01 17:28:30 +02:00
fa430e5fc0
WORK IN PROGRESS
2015-03-31 11:05:17 +02:00
8b3cca50a0
Modifying to Qt5
2015-03-31 10:22:21 +02:00
52dc3b265d
Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5
...
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.
Conflicts:
GraphicsView/demo/Polygon/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/CMakeLists.txt
GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
Installation/cmake/modules/CGALConfig_binary.cmake.in
Installation/cmake/modules/CGALConfig_install.cmake.in
Installation/cmake/modules/CGAL_Macros.cmake
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
Mesh_3/demo/Mesh_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
2015-03-30 16:02:51 +02:00
040458d248
Update of all the CMakeList and .cmake files for Qt5
...
Reasy for merging the cpp files from clone qt5
2015-03-30 15:34:17 +02:00
c22687c28a
add Visibility package to changes.html
2015-03-26 16:48:21 +01:00
4f26ed0853
CHange the release month to April 2015
2015-03-26 10:32:19 +01:00
32ce6df3a0
Polish announcement and changes. Prepare 4.6.
2015-03-10 11:07:08 +01:00
c81fc2be06
Merge branch 'master' of github.com:lrineau/cgal into lrineau-master
...
Conflicts:
.gitignore
2015-03-05 00:54:57 +01:00
c866365d2a
Update CHANGES with recent changes
2015-02-26 18:34:22 +01:00
04fdf00d76
Add 2D Polyline Simplification; fix the description of Surface_mesh
2015-02-25 11:40:36 +01:00
71a1a4905b
Added 2D Arrangement polycurve
2015-02-25 09:36:42 +02:00
c3124cc572
add deprecation of Convex_hull_d
2015-02-24 11:31:41 +01:00
6f4accb6ef
fix typos
2015-02-24 11:24:43 +01:00
73c75212d4
CGAL-4.6 will be released in March 2015
...
+ update the text file CHANGES
2015-02-19 17:49:36 +01:00
bfff3a77a6
Reformat the white-space, to enforce 80 columns
2015-02-19 17:48:44 +01:00
607929b069
Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch'
...
Conflicts:
Installation/changes.html
Maintenance/release_building/public_release_name
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
2015-02-16 11:45:08 +01:00
e3de928e26
Fix the release date
...
+ reindent
+ update CHANGES
2015-02-12 17:32:28 +01:00
98a4fce6ee
update changes
2015-02-12 17:19:29 +01:00
0b9169fd65
update changes.html
2015-02-12 17:09:14 +01:00
e08c28727c
Add #defines to trick moc
...
(cherry picked from commit 5db9675db8
2015-01-26 16:25:58 +01:00
ff62595012
Merge branch 'CGAL-fix_compilation_boost_1_56-lrineau'
...
Fix compilation issues with Boost-1.56 and later.
Approved by the Release Manager.
2015-01-26 11:42:29 +01:00
87c340fc64
Merge remote-tracking branch 'origin/CGAL_moc_BOOST_JOIN-GF'
...
Fix the compilation of Qt4 demos, when Boost-1.57 is used.
Approved by the Release Manager.
2015-01-26 11:23:57 +01:00
d444701fa0
Add that Kd_tree::begin(0/end() is not in the insertion order
2015-01-20 10:40:10 +01:00
5db9675db8
Add #defines to trick moc
2015-01-19 17:54:26 +01:00
b3f769d486
Merge remote-tracking branch 'origin/Installation-test_tbb_4.3-GF'
...
Tested in CGAL-4.6-Ic-107
Approved by the (interim) release manager
2015-01-16 15:41:50 +01:00
59a7f710dd
Merge branch 'Spatial_searching-final_acceleration-gf'
...
Improve the performance of Spatial Searching.
Small features:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Spatial_searching_performance_optimization
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/spatial_searching_compiletimeD
Approved by the Release Manager
Conflicts:
Installation/changes.html
2015-01-15 15:31:35 +01:00
fd2026a044
Find TBB first with NO_DEFAULT_PATH
...
With default CMake paths, the TBB installed in /usr/{include/,lib64/} is
found, whatever there is in TBB environment variables. If the search
with NO_DEFAULT_PATH does not find TBB, then the search is made again
with default paths.
2015-01-15 14:39:31 +01:00
b6f5088676
Merge branch 'Scale_space_reconstruction_3-tvanlank'
...
Tested in CGAL-4.6-Ic-104
Approved by the release manager
2015-01-14 16:09:11 +01:00
d80ee9422a
Merge branch 'CGAL-fix_compilation_boost_1_56_4.5-branch-lrineau' into CGAL-fix_compilation_boost_1_56-lrineau
...
Conflicts:
Installation/changes.html
2015-01-14 14:49:52 +01:00
5134b29461
Update the changes.html file
2015-01-13 17:30:45 +01:00
a92e4101d8
Merge branch 'CGAL_workaround_counting_iterator-GF'
...
Approved by the release manager
2015-01-12 11:48:10 +01:00
8929fd43c1
Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
...
Approved by the release manager
Conflicts:
Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
6e36a853a9
Merge branch 'Surface_mesh-new_package-GF'
...
Approved by the release manager
Conflicts:
Documentation/doc/Documentation/dependencies
Documentation/resources/how_to_cite_cgal.bib.in
Installation/changes.html
2015-01-12 11:27:35 +01:00
2c961258cb
update changes and bibtex file
2015-01-09 14:14:30 +01:00
d2e0dca2f9
update changes
2015-01-09 12:36:07 +01:00
43e8fae5f8
cosmetic changes
2015-01-09 10:49:26 +01:00
0218954ea6
Merge branch 'barycentric_coordinates_2-dmitry'
...
Tested in CGAL-4.6-Ic-99 and CGAL-4.6-Ic-100
Approved by the release manager
Conflicts:
Installation/changes.html
Kernel_23/include/CGAL/internal/Projection_traits_3.h
2015-01-09 10:35:20 +01:00
5adf8e388c
Workaround for boost::container::deque; 1 bug fix
2015-01-09 10:23:32 +01:00
e0b402b094
Merge branch 'Triangulation-higher_dimensions-odevil_shornus'
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Triangulation_d
Tested in CGAL-4.6-Ic-98
Approved by the release manager
2015-01-08 18:15:34 +01:00
02ab5261bc
Approved by the Release Manager
...
Merge branch 'Generators_convex-rthomass'
2015-01-08 15:46:24 +01:00
9a6ed32a15
Merge branch 'Combinatorial_map-update_attributes-sbrandel'
...
- corresponding to small feature "Combinatorial map update attributes"
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Combinatorial_map_update_attributes
- succesfully tested, release number CGAL-4.6-lc-99
- Approved by the Release Manager
Conflicts:
Installation/changes.html
2015-01-08 14:48:47 +01:00
188ee42012
Restore the executable bit of all scripts
2015-01-07 17:54:56 +01:00
92681aae83
added changes in Installation/changes.html
2015-01-07 16:21:16 +01:00
4f5619e349
Add a README.md at the root of the SCM repository
...
- A file INSTALL.md is also added,
- Installation/INSTALL is added the .md extension,
2015-01-07 11:40:24 +01:00
f85647f666
changes.html
2015-01-06 17:04:30 +01:00
8e4a486024
Updated file changes.html.
2014-12-29 16:40:15 +01:00
7d9f7bcf9c
Test update and modification of the file changes.html.
2014-12-29 16:16:30 +01:00
476fadca6a
Add Surface_mesh to changes.html
2014-12-22 18:05:42 +01:00
e6f1aaa801
Fix the HTML in changes.html
2014-12-22 16:50:03 +01:00
6b54e74af5
fix opy paste error
2014-12-20 16:15:08 +01:00
30faf6241b
Add wrappers around 2 boost headers to push/pop pragma
2014-12-19 16:10:02 +01:00
b85f97593a
Add entry in changes.html
2014-12-19 14:43:08 +01:00
7a06a08ca4
Update doc to state that ICC prior to version 15 is not supported for Epick_d
...
Approved by the Release Manager
2014-12-18 12:42:34 +01:00
315ffdcbc8
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-12-18 09:32:23 +01:00
c043a0dca9
Merge branch 'Installation-Boost_DEBUG-lrineau'
...
Add Boost_DEBUG as a CMake advanced option.
2014-12-17 17:08:43 +01:00
79d2f2383c
update changes
2014-12-16 11:52:59 +01:00
f3ab2cf92d
Merge branch 'to-be-tested/Triangulation_3-determinism-gf'
...
make Triangulation_3 deterministic from platform to platform
on degenerate cases
Approved by the release manager
2014-12-15 14:01:45 +01:00
6b6af12353
fix the BOOST_JOIN parse error in demos
...
somehow, boost/random.hpp includes boost/type_traits/has_binary_operator.hpp,
and the "parse error" happens in this file (as said in the bug report)
Also update the link to the official Qt bug report
2014-12-11 12:17:44 +01:00
e7fa0e396d
Updated changes.html
2014-12-11 10:13:07 +01:00
3972130053
update changes.html
2014-12-11 08:50:21 +01:00
9da9cff768
Merge branch 'Spatial_searching-Rectangle_compiletimeD-gf' into Spatial_searching-final_acceleration-gf
...
Conflicts:
Spatial_searching/benchmark/Spatial_searching/nn3cgal.cpp
Spatial_searching/include/CGAL/Kd_tree.h
Spatial_searching/include/CGAL/Kd_tree_node.h
2014-11-28 13:10:08 +01:00
5b67887a5e
Merge branch 'Spatial_searching-Sliding_Midpoint_Splitter_bugfix-gf' into Spatial_searching-final_acceleration-gf
2014-11-28 12:43:12 +01:00
09da20c021
Merge branch 'Mesh_3-fix_integer_overflow-jtournoi'
...
this branch fixes Image_IO for large images, when the
dimensions do not fit in 'unsigned int'
'size_t' is now used everywhere that deals with image sizes
and pixel/voxel coordinates
fix suggested by a CGAL user
Tested in CGAL-4.6-Ic-64.
Approved by the Release Manager.
2014-11-28 12:33:40 +01:00
8231a36e89
Add Boost_DEBUG as an advanced OPTION
2014-11-28 12:09:14 +01:00
c6de2a50b2
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-11-20 19:19:23 +01:00
4b46c889e4
update changes.html
2014-11-10 10:42:20 +01:00
7d63f9d072
Merge branch 'releases/CGAL-4.5-branch'
...
Conflicts:
Installation/changes.html
Maintenance/release_building/public_release_name
2014-11-06 10:47:45 +01:00
d85eaa327c
Merge remote-tracking branch 'origin/Mesh_3-fix_exuder_holes_on_surface-GF' into releases/CGAL-4.5-branch
...
Bug-fix for Mesh_3:
Fix a bug in the sliver exudation preservation of boundaries.
Approved by the Release Manager.
2014-10-31 11:32:09 +01:00
dd71424b23
Added Spatial_searching Splitter bugfix to changes.html
2014-10-31 11:29:37 +01:00
a533ea4bee
fix typos
2014-10-25 18:52:54 +02:00
7d02983fb3
Fail quietly when Qt5 is not found
...
That is the general rule within CGAL: one must use
find_package(<package> QUIET)
and allow to fail quietly when a 3rd-party library is not found.
2014-10-25 18:51:49 +02:00
5e44b5b511
Fix whitespace
2014-10-25 18:46:53 +02:00
df0ec2e54d
mention exuder bug fix in changes.html
2014-10-21 11:29:07 +02:00
908d608072
Merge branch 'releases/CGAL-4.5-branch'
...
Conflicts:
Installation/changes.html
2014-10-20 14:46:36 +02:00
52c4437539
This branch needs to bump the SONAME
2014-10-20 14:41:14 +02:00
8d61c8db07
Add comments (following the manual chapters)
2014-10-06 16:52:22 +02:00
f5d89b443e
Update CHANGES
2014-10-06 16:46:28 +02:00
aabd9dc557
update changes
2014-09-29 08:44:51 +02:00
377342b311
add backward compatibility class/doc/test
2014-09-23 11:34:47 +02:00
0040d62791
Update changes.html
2014-09-18 15:09:41 +02:00
8f259e5dea
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-09-09 11:20:33 +02:00
58e1779c1e
Prepare future final release 4.5
2014-08-29 15:22:35 +02:00
ec39bd6ea9
Add of Qt5 support into documentation.
2014-08-19 18:50:38 +02:00
38d22d8ea8
Try of remove all warning about CMP0020 POLICY on Windows. That doesn't work, but I let the code added because that allows the user to set himself the qtmain lib.
...
Moreover, I tried to fix the bug on snap_rounding, but I can't manage to find out what create these black rectangles instead of the lines.
2014-08-18 18:09:07 +02:00
311b505cad
Update the comment about the SOversion
...
Trivial fix for master
2014-08-18 15:35:17 +02:00
68a8ad6607
Big improvement of Qt4or5 and findQt5.
...
Now, when a switch is done by the user between Qt4 and Qt5, all the qt executables are refound, searching the proper version of them (Qt4 or Qt5)
A new bug, that wasn't noticed the first time, has been found and corrected into Mesh_3.
2014-08-18 03:13:47 +02:00
6e7abcdade
Correction of flag problem into Arrangement_on_surface_2_demonstration.
2014-08-16 14:34:11 +02:00
c6296e6e14
To allow the SDK path choice to user during demosntration configuration.
2014-08-15 16:59:22 +02:00
25c55d6178
End of Windows SDK support, with the path memorised into CGAL CMake config files. .
2014-08-15 16:38:49 +02:00
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +02:00
f1f6218ca7
Fix of some bugs with Arrangement on surface 2 and others demonstrations.
...
Improvement of some comentaries.
Change of findQt5.cmake flags using.
2014-08-14 02:15:02 +02:00
0fa93fb5ec
Adding of some commentaries at the new .cmake top files.
2014-08-13 17:43:39 +02:00
d4bdae3077
Prepare CGAL-4.5-beta1
2014-08-12 19:09:57 +02:00
daa20fd1aa
Better tests
...
Current version of leda-numbers still fails. :-(
2014-08-11 19:55:21 +02:00
3ae8979318
Add a test for LEDA
...
When LEDA is available, that test program tests very basic I/O
operations of `leda::rational`. That also tests the link with LEDA.
2014-08-11 19:55:21 +02:00
9b0a59972f
Support for LEDA_numbers on Windows
...
trivial fix for master (and approved by the Release Manager)
2014-08-07 14:16:38 +02:00
7a0e8f545d
Bugs correction about STREQUAL into findQt5.
2014-08-05 10:05:15 -07:00
c59f075e22
Merge branch 'gsoc2014-CGAL-Qt5_support-vialon' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2014-CGAL-Qt5_support-vialon
2014-08-05 18:15:37 +02:00
6df9530094
All GraphicView demonstrations ported to the new Qt inclusion way.
...
Change of Qt4or5 variables names.
Now: QT_VERSION => contains "QtX", with x 4 or 5 depending of the version wanted by the user.
USE_QT_VERSION => variable to force the version of Qt wanted. If this variable is set, the Qt Choice drop-down menu doesn't appear on CMake-gui.
QT_VERSION_USED => number of Qt version wanted (4 or 5).
QT4 => TRUE if Qt4 chosen.
QT5 => TRUE if Qt5 chosen.
2014-08-05 18:13:39 +02:00
956ac8896f
Fix indentation
2014-08-05 17:27:18 +02:00
9a1461442b
Some bug correction for new Qt inclusion way.
...
Following demonstrations ported to Qt4or5 way :
- Polyhedron
- Linear Cell Complex
- Mesh_3
- Periodic_3_Triangulation
- Periodic_Llyod_3
- Surface_reconstruction_point_3
2014-08-04 20:16:44 +02:00
865eee70f7
Support LEDA with thread-support
...
If one use a library of LEDA that support threads, without setting
LEDA_MULTI_THREAD, then one can get segfaults when creating new LEDA
objects.
2014-08-04 15:53:58 +02:00
313aa5fb3c
Bug correction for Qt5 feature.
2014-08-03 17:24:24 +02:00
0a457c4b03
Correction of some bug caused by the new find_package way of Qt (Qt4or5) with the Qt4 support.
2014-08-02 14:59:49 -07:00
46c8926854
New way to chose Qt version for projects configuration.
...
Now, we have choice between "WITH_CGAL_Qt4" and "WITH_CGAL_Qt5" (like before because differents CGAL_QtX sources folders return).
Once the libCGALQt4 or libCGALQt5 configured, an cmake config variable "CGAL_QT_RECENT" allow us to know what is the more recent libCGAL_QtX configured.
Automaticaly,the demonstrations chose this recent version of Qt to build their project (even if a Qt version choice is proposed during CMake configuration)
During CMake configuration, when the user change the version of libCGAL_QtX, that change automaticaly the Qt version of find_package(QtX)
Now Qt4or5 is the thing allowing the choice between Qt4 and Qt5 (find_package(CGAL COMPONENT Qt4or5) or find_package(Qt4or5))
2014-08-02 01:37:41 +02:00
6cba91ac8f
Recode changes.html to UTF-8.
...
And update CHANGES.
2014-08-01 14:12:55 +02:00
3214507a45
Merge branch 'CGAL-fix_cmake_3-GF'
...
Add the compatibility with CMake 3.0, without using any new feature.
Tested in CGAL-4.5-Ic-104.
Approved by the Release Manager.
2014-08-01 14:11:02 +02:00
6784800dd1
Fusion of CGAL_Qt4 and CGAL_Qt5 into just one CGAL_Qt.
2014-07-31 22:41:44 +02:00
2b6fa0076a
Merge branch 'BGL-fix_halfedge_edge_is_border_pmap-sloriot'
...
Tested in CGAL-4.5-Ic-105
Approved by the (interim) release manager
2014-07-24 20:41:06 +02:00
4653c4344c
Try of make CGAL_IO demonstration working.
2014-07-24 18:56:48 +02:00
cc36cf8359
Merge branch 'boost-work_around_dijktra_bug_1.54-local'
...
Distribute dijktra header file from boost 1.55 to work around
a bug in the version 1.54. The header file is only used if the
user compiles with boost 1.54
Tested in CGAL-4.5-Ic-102
Approved by the release manager
Conflicts:
Installation/changes.html
2014-07-23 08:46:33 +02:00
cdec3d6414
make the edge_descriptor of Polyhedron hashable
2014-07-23 08:20:16 +02:00
2826df7237
Correction of Windows platforms bug about CGAL libraries not considered.
2014-07-22 19:07:34 +02:00
926aa7500f
Set CMP0042 to OLD
...
That avoids a warning on MacOS.
2014-07-22 15:14:52 +02:00
3dd4069bf0
Fix a bug with CMake 3.0
...
Actually, in my opinion that was also a bug with other versions of
CMake.
Before this commit, in Installation/src, CGAL_CONFIGURED_LIBRARIES was
set to the empty string "" *in the parent scope* (Installation),
then the variable is modified in the current scope Installation/src, and
then the variable value is copied to a cache variable of the same name.
In my opinion, that means that the parent scope (Installation) has a
non-cache variable CGAL_CONFIGURED_LIBRARIES that is empty (""), and a
cache variable that is not empty (that contains, for example
"CGAL_Core;CGAL_Qt4;CGAL_ImageIO"). The document of CMake-3.0 precisely says
that the semantic of variables is such that cache variables have the
lowest priority. See:
http://www.cmake.org/cmake/help/v3.0/manual/cmake-language.7.html#variables
As far as I know, that was supposed to be the same for CMake 2.8, but I
cannot find out where it is described in the documentation. Anyway, the
bug was visible with CMake 2.8 and not with CMake 3.0.
The patch simply does not set the empty value of
CGAL_CONFIGURED_LIBRARIES in the parent scope, but only in the current
local scope.
2014-07-22 15:04:12 +02:00
4d468d1881
Add compatibility with CMake 3.0
...
Trivial bug-fix for master
2014-07-22 12:47:59 +02:00
5c6b54257a
the XXX_is_border properties are removed + add missing replacement functions
2014-07-22 12:00:15 +02:00
da77e0d819
Name of leda_numbers of Windows
...
Trivial fix for master
(cherry picked from commit 601d05d717edead7ea8396a0f723b715bbd9bdc6)
2014-07-21 14:00:59 +02:00
45f7298ce7
Merge branch 'Polyhedron_demo-import_splatting-GF'
...
Tested in CGAL-4.5-Ic-100
Approved by the release manager
Conflicts:
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
2014-07-21 08:23:36 +02:00
bc8e1f399d
workaround a bug in dijsktra algorithm in boost 1.54 affecting normal estimation
2014-07-19 12:20:29 +02:00
25f74f2a74
LEDA library numbers has been renamed to leda_numbers
...
trivial bugfix for master
2014-07-18 16:04:27 +02:00
fbf824c711
Merge branch 'Mesh_3-parallel-cjamin'
...
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3
Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
2014-07-17 19:08:24 +02:00
fce46e5164
document the removal of the surface reconstruction demo
2014-07-17 13:41:43 +02:00
ca70dd0bde
The parallel algorithms are experimental
2014-07-17 10:52:39 +02:00
Andreas Fabri
Laurent Rineau
Philipp Möller
Sébastien Loriot
Aymeric PELLE
Efi Fogel
Maxime Gimeno
Sebastien Loriot
Laurent Rineau
Michael Hemmer
Jane Tournois
Clement Jamin
Remy Thomasse
Sylvain Brandel
Dmitry Anisimov
m.overtheil
Aurélien Vialon