47a41ccab0
cleanup
2015-10-01 12:38:55 +02:00
1a4faa8575
Merge branch 'CGLAL-thread_local_storage-GF-old' into CGLAL-thread_local_storage-GF
2015-10-01 10:03:04 +02:00
e4342d50d2
Merge remote-tracking branch 'cgal-dev/CGAL_headers_only-gdamiand_cjamin' into CGAL_headers_only-gdamiand_cjamin
2015-10-01 09:48:54 +02:00
3d4a1be429
WIP with Clement
2015-10-01 09:47:47 +02:00
cf1c0ea0ca
Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin
2015-10-01 09:12:55 +02:00
ac591cf257
Merge branch 'Point_set_processing_3-TBB-GF-old' into Point_set_processing_3-TBB-GF
2015-09-29 13:50:17 +02:00
da650cbd1c
Merge branch 'old/CGAL-Solver-packages-GF' into CGAL-Solver-package-GF
2015-09-26 15:47:54 +02:00
81d65c9aa1
Merge pull request #349 from sgiraudot/Surface_mesh_parametrisation-OpenNL_Eigen-GF
...
Surface mesh parametrisation - Replace OpenNL by Eigen as default
2015-09-26 15:37:04 +02:00
8d3e06b7c4
Merge pull request #252 from bo0ts/Installation-remove_config_test-pmoeller
...
Delete CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG.cpp
2015-09-26 09:55:53 +02:00
1b6643f334
Merge branch 'Point_set_processing_3-TBB-GF' of github.com:sgiraudot/cgal into Point_set_processing_3-TBB-GF
2015-09-24 12:46:33 +02:00
13e4a76cd8
Merge branch 'Point_set_processing_3-TBB-GF-old' into Point_set_processing_3-TBB-GF
2015-09-24 12:45:58 +02:00
013316182d
tips on how to update code
2015-09-24 07:30:04 +02:00
f1ebd105b5
Merge pull request #251 from bo0ts/Installation-fix_cmp_0054-pmoeller
...
Make CMake code compatible with CMP0054
2015-09-23 12:18:08 +02:00
36723443a4
Merge branch 'CGAL-Solver-package-GF-old' into CGAL-Solver-package-GF
2015-09-23 10:29:14 +02:00
b970fc80ef
Merge branch 'old/Surface_reconstruction_points_3-Change_package_name-GF' into Surface_reconstruction_points_3-Change_package_name-GF
2015-09-22 09:54:18 +02:00
68aa21292a
Merge branch 'old/CGAL-Solver-packages-GF' into CGAL-Solver-package-GF
2015-09-21 07:34:18 +02:00
c6f2cedafc
Update changes.html
2015-09-18 15:36:27 +02:00
1d89949b38
Prepare the comments for the changes of 4.8
2015-09-17 13:40:01 +02:00
205f2adabb
CGAL-4.7 will be published in October, not September
2015-09-17 13:03:23 +02:00
2d5dd933e5
Reformat the changes.html/CHANGES
...
I have:
- rewrapped the paragraphs so they can be easily copy-pasted in a
mail,
- added <code></code> when needed,
- and I did also minor fixes.
2015-09-17 13:03:08 +02:00
04f7fdc0c7
Update changes.html
2015-09-16 18:25:12 +02:00
0d70d7b1ce
do not write 'static' in the macro so that we can use the macro also for a definition
2015-09-14 10:17:22 +02:00
4ba71bce35
fix for the single threaded case
2015-09-14 09:50:03 +02:00
ea612e9645
Improved macros to avoid #if #else where we want to use TLS
...
The Residue.cpp file still needs simplification
2015-09-11 18:01:51 +02:00
a14cf913e9
WIP: In Lazy.h we now have a single macro for boost and c++11 thread
2015-09-11 14:54:11 +02:00
470e96e75c
document msvc2015 support
2015-09-11 10:42:57 +02:00
aa649eccc9
bug fix
2015-09-11 08:58:32 +02:00
434e66a0f1
move detection of that the keyword threadlocal can be used from Mpzf.h to config.h
2015-09-10 12:44:52 +02:00
687c7ba820
Update changes.html
2015-09-09 12:03:58 +02:00
24666eb13e
deal with msvc12 and msvc14
...
until now, msvc14 is not supported by tbb (<= 4.4)
this commit prevents the testsuite from looking for it
2015-09-08 10:21:55 +02:00
a31129f93d
add layout for the 4.8 release including the "Surface Reconstruction" part
2015-09-07 10:19:12 +02:00
220651bc88
Use CGAL_THREAD_LOCAL as thread_local only comes with VC201
2015-09-04 18:09:50 +02:00
bc5272495b
For MSVC we no longer require boost thread and system
2015-09-04 11:50:54 +02:00
52e5f3a521
Add a wrapper for the very basic mutex locking we make use of
2015-09-04 08:38:55 +02:00
a3187fd35e
Merge pull request #285 from janetournois/CGAL-support_msvc2015-GF
...
Initial support for MSVC 2015
2015-08-27 16:34:29 +02:00
3b5ff3f1ff
Update changes.html and CHANGES.
2015-08-27 16:32:20 +02:00
0fd6f2fa59
Merge pull request #288 from afabri/CGAL-add_hash-GF
...
No longer forward declare struct std:hash
Fixes issues #287 and #274 .
2015-08-27 15:41:50 +02:00
bf975ead95
No longer forward declare struct std:hash
2015-08-23 14:30:54 +02:00
5c2c3ca596
Update changes for 4.6.2
2015-08-20 12:10:48 +02:00
48a728791e
Update changes.html
...
move misplaced entry for 4.5 (mesh3 -> triangulation3)
2015-08-17 18:16:10 +02:00
ebe89cff22
Update the announcement mail
...
- fix a typo: connnected
- re-wrap paragraphs
2015-08-07 17:10:30 +02:00
500812b520
Delete CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG.cpp
...
The check is not used anywhere. The only place that could possibly use it is Installation/include/CGAL/internal/deprecation_warning.h which is already portable without the need for a configuration-time check.
2015-08-05 15:12:25 +02:00
dea9451c53
Move the add_config_flag macro to where it is used
2015-08-05 14:56:09 +02:00
f0fad560f6
Remove unnecessary add_config_flag call
...
This call to add_config_flag has no effect. It is made before the
file(WRITE ${CMAKE_BINARY_DIR}/include/CGAL/compiler_config.h ...) which
overwrites the contents of the file.
This is surely a bug, because ${CGAL_EXT_LIB_${lib}_PREFIX} expands to
things like GMP or MPFR which would be really bad defines.
2015-08-05 14:56:09 +02:00
e598d67ba6
CONFIG_CXX_FLAGS is no longer used
2015-08-05 14:56:09 +02:00
de403e8cc4
Always run the config tests
...
The code tried to prevent running the config tests to often by caching
their values and only rerunning them when the CMAKE_CXX_FLAGS change.
While this is smart it only buys us a few seconds and is not actually
correct. One of those bugs could be triggered through linker flags or
debug flags as well and just checking CMAKE_CXX_FLAGS is far from
enough. To be on the safe side we accept the extra
configuration-time (which is usually also minimized by using compiler
caches).
This also removes a warning caused by CMake policy CMP0054.
2015-08-05 14:56:09 +02:00
8e5f887765
Prevent triggering of CMP0054
...
CMAKE_CXX_COMPILER_ID can expand to the string MSVC, which is also a
variable name which has been expanded by before CMP0054 has been
introduced.
This would lead to a bug *if* we would MATCHES against the string "MSVC",
but only triggers a warning.
Also quote some implicit string in a MATCHES for style reasons.
2015-08-05 14:56:08 +02:00
5cf0951577
Whitespace fixes
2015-08-05 14:56:08 +02:00
9b988404bf
Set CMP0054 to NEW
...
We set it to new by removing the code that sets it to OLD.
2015-08-05 14:56:08 +02:00
714fc9092b
Remove an unused file
...
This file was unused for six years:
cmake/modules/CGAL_CreateSingleSourceCGALProgramQt4.cmake
I remove it.
2015-08-03 15:00:18 +02:00
928520b1bb
Merge pull request #214 from lrineau/Installation-support_MSVC2015-GF
...
Add support for VC14 (from MSVC 2015)
2015-07-31 14:26:11 +02:00
d0bf3ecfd6
Merge pull request #211 from lrineau/Installation-disable_Qt3_by_default-GF
...
Disable CGAL_Qt3 by default
2015-07-30 18:00:07 +02:00
a25705527e
Merge pull request #212 from lrineau/Installation-CMP0054_OLD-GF
...
Remove the warning about CMP0054
2015-07-30 17:58:02 +02:00
f3d55fcb63
Add support for VC14 (from MSVC 2015)
...
There was eventually no VC13.
- In cmake/modules/CGAL_GeneratorSpecificSettings.cmake replace it by
MSVC14. Add a support for a futur MSVC15.
- Synchronize include/CGAL/auto_link/auto_link.h from the future
Boost-1.59 (not yet released), to add support for VC14/MSVC2015.
2015-07-30 11:28:13 +02:00
a6b6105a7f
Remove the warning about CMP0054
...
That is temporary.
2015-07-29 15:44:21 +02:00
e72e89971d
Bump SOVERSION to 11.0.1 (no change)
2015-07-29 15:33:16 +02:00
e4659d6a37
Disable CGAL_Qt3 by default
2015-07-29 14:21:07 +02:00
8a0a14a051
Merge pull request #198 from aympelle/Fix_3D_PT_in_changes_html-APelle
...
Fix changes.html
2015-07-28 16:35:25 +02:00
d7c464ccc1
Fix changes.html
...
"<version>" must be quoted.
2015-07-28 16:27:53 +02:00
92eb77d3d0
Fix changes.html : 3D periodic triangulations changes were badly located.
2015-07-27 16:58:15 +02:00
4f593d5d96
add info on how to help cmake find qt5
2015-07-17 17:12:00 +02:00
b43c8f4df6
remove comments
2015-07-17 17:04:32 +02:00
af341e4c23
Update requirement for Qt5: Debian-stable has 5.3.2
2015-07-17 16:05:12 +02:00
5de30629bc
Polish changes.html
2015-07-17 15:58:33 +02:00
08666dce25
Merge pull request #179 from afabri/CGAL-add_hash-GF
...
Add boost::hash and std::hash
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash
Conflicts:
Installation/changes.html
2015-07-17 15:39:18 +02:00
5d2c892dbe
Merge pull request #149 'lrineau/Polygon_mesh_processing-GF'
...
Add various functions to manipulate polygon meshes
2015-07-17 14:50:56 +02:00
2668d83d4e
Merge pull request #150 from 'cjamin/Point_set_shape_detection_3-cjamin'
...
Add an algorithm to fit geometric primitives on a point set
Conflicts:
Installation/changes.html
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-07-17 14:32:09 +02:00
aa72eaa371
Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF
...
Qt5 support, GSoC 2014
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support
In this commit, I have fixed the permissions of the file:
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points
In this commit, I have also modified:
Installation/changes.html
2015-07-17 14:13:37 +02:00
6b15ec643c
Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF
...
Conflicts:
Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
2015-07-16 16:52:53 +02:00
5c58b6fe21
fix changes.html
2015-07-16 13:34:40 +02:00
a1c9ef62d1
Fix last CMake issues in test/Installation/
2015-07-14 18:17:54 +02:00
e43b1e42ba
Do include the export file if CMP0024 does not exist
...
With CMake-2.8.11, CMP0024 does not yet exist, and the target aliasing
feature does not exist either. So the only solution is to include the
export file.
2015-07-14 16:06:53 +02:00
877634ba9f
Avoid multiple definitions of the target aliases
...
With -DWITH_demos:BOOL=TRUE, the CGALConfig.cmake is included multiple
times. This patch avoids that one tries to define multiple times the
same target aliases.
2015-07-14 15:59:56 +02:00
3262264cbd
Search dependencies quietly
2015-07-14 15:12:47 +02:00
fb4975f469
Check if the libraries are actually defined
...
In CGALConfig.cmake, the former code was just checking if
WITH_${CGAL_LIB} was TRUE. Now, the new code also checks if the target
was actually defined. If the target is not defined by WITH_${CGAL_LIB}
is ON, if probably means that one dependency of the library was not
properly configured.
2015-07-14 15:12:47 +02:00
72104a5d29
Add link_to_CGAL_Qt5
2015-07-13 17:37:52 +02:00
34ccb7facd
Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller
...
Add a CGALExports.cmake file
Conflicts:
Installation/cmake/modules/CGALConfig_binary.cmake.in
This merge should fix the warning caused by CMP0024.
2015-07-13 12:45:19 +02:00
f9917c487e
CMake 2.8.11
2015-07-13 12:36:43 +02:00
6506a35e7f
It is CMake 2.8.11 that we want.
2015-07-13 12:21:54 +02:00
c616df7196
Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF
...
Conflicts:
Documentation/biblio/cgal_manual.bib
Installation/changes.html
2015-07-13 08:16:59 +02:00
0fb169701f
Copy changes.html from master, to remove conflicts
2015-07-10 18:11:11 +02:00
f40fe0dc2d
Merge branch 'gsoc2013-Visibility_doc-hemmer' into CGAL-Qt5_support-GF
2015-07-10 18:07:26 +02:00
fa13f4ed0c
Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF
2015-07-10 17:28:07 +02:00
b043876c68
Merge pull request #147 from philaris/sdglinf-philaris
...
L Infinity Segment Delaunay Graphs, new package
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Segment_Delaunay_graph_Linf_2
2015-07-10 17:26:42 +02:00
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
ed71d08e3d
Do not include the CGALExport.cmake file while still building CGAL
...
This rightfully triggers CMP0024, since the file created by export might
not exist at configure-time. We need to do some extra work to avoid
reading the LOCATION property from a non-imported target hence we
trigger policy CMP0026.
2015-07-10 15:33:37 +02:00
d70b65e431
Merge branch 'gsoc2013-Visibility_doc-hemmer'
...
PR 145
2015-07-10 15:25:39 +02:00
518faece88
Merge remote-tracking branch 'cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF
2015-07-10 14:04:03 +02:00
9550a41b67
Merge pull request #133 from bo0ts/Installation-add_exports-pmoeller
...
Add a CGALExports.cmake file
Conflicts:
GraphicsView/src/CGAL_Qt5/CMakeLists.txt
Installation/cmake/modules/CGALConfig_binary.cmake.in
Installation/cmake/modules/CGALConfig_install.cmake.in
There was also a conceptual conflict in:
Installation/src/CMakeLists.txt
2015-07-10 14:03:20 +02:00
47b7ac3c07
update script to find QGLviewer so that the environment variable is used first
2015-07-10 11:32:20 +02:00
9ce70faffb
Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' into CGAL-Qt5_support-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/CMakeLists.txt
There was also a "conceptual conflict" in:
Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp
-> Adapt the declaration of the plugin to the Qt5 way.
2015-07-09 18:04:09 +02:00
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
e7563d3e05
Merge branch 'gsoc13-CurveSkeleton-new_package-xgao'
...
Conflicts:
Installation/changes.html
2015-07-09 17:30:24 +02:00
43de56ba21
Merge pull request #167 from afabri/AvoidMergeConflicts
...
Add place holders for the packages to be integrated
2015-07-09 10:33:23 +02:00
bbd6951161
Merge branch 'afabri/Advancing_front_surface_reconstruction-afabri' into CGAL-Qt5_support-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp
There was also two "conceptual conflicts" that git-merge did not see,
in:
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt had to use qt5_wrap_ui instead
of qt4_wrap_ui (that lead to a CMake error), and the declaration of the plugin in
Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp
was not using the Qt5 way (that lead to a compilation error)
2015-07-08 17:21:36 +02:00
0d431e39ab
remove qt4 specific code
2015-07-07 18:00:43 +02:00
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
89184387d6
remove no longer needed QT4 cmake scripts
2015-07-07 18:00:43 +02:00
0401e17fc0
move to place holder
2015-07-07 16:46:32 +02:00
b2914e78d7
add empty line
2015-07-07 16:18:16 +02:00
49ba9e48bb
add empty line
2015-07-07 16:13:06 +02:00
7e041bcc50
move to place holder
2015-07-07 15:58:58 +02:00
3c3fb9b0bb
move to place holder
2015-07-07 15:23:55 +02:00
c09f7e86ef
fix end of html comment
2015-07-07 14:59:36 +02:00
d26fdb17bf
Add place holders for the packages to be integrated
2015-07-07 13:37:47 +02:00
3b8c24a4df
Added the package
2015-07-07 12:06:46 +02:00
49c2cdc19a
Merge branch 'master' into sdglinf-philaris
...
Conflicts:
Installation/changes.html
2015-07-06 18:33:08 +02:00
e5bcdc5f3e
Update all CMakeLists.txt
...
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
99f8b0d80e
Allow to find QGLViewer-qt5 on Windows too
2015-07-06 17:29:39 +02:00
e6ad9a82b3
Add a wrapper for the changes entry of sdglinf-philaris
2015-07-06 11:01:21 +02:00
05e0900b3e
update changes.html
2015-07-06 10:38:41 +02:00
253ec38a0a
Announce new functors for alpha-shapes
...
As asked in the last comment of https://github.com/CGAL/cgal/pull/84
2015-07-05 16:07:24 +02:00
5ac1311b01
updated announcement of new package sdg-linf
2015-07-03 17:32:45 +02:00
6484a56485
announce the new feature sdg-linf
2015-07-03 17:21:51 +02:00
a9fae2ea9b
update changes
2015-07-03 16:28:22 +02:00
c21c9dda35
Merge pull request #141 from afabri/Advancing_front_surface_reconstruction-afabri
...
Advancing Front Surface Reconstruction, new package
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Advancing_front_surface_reconstruction
2015-07-03 16:26:28 +02:00
33a1fdbcbc
Replace CGAL_LIBRARY with the actual CGAL target
...
The variable CGAL_LIBRARY is no longer defined within the build as it is
completely unnecessary and using the actual target allows more features.
2015-07-03 12:30:23 +02:00
bdd46e6978
Merge branch 'gsoc2013-Visibility_doc-hemmer-old' into gsoc2013-Visibility_doc-hemmer
...
Conflicts:
Documentation/biblio/cgal_manual.bib
Documentation/biblio/geom.bib
Installation/changes.html
2015-07-02 17:36:17 +02:00
c97f1e6d26
remove 2 empty lines
2015-07-02 12:55:46 +02:00
a900133057
move package in changes.html to avoid merge conflict
2015-07-02 12:52:54 +02:00
6dadd19bf6
add entry to changes.html
2015-07-01 18:21:16 +02:00
e291e91369
Added the package
2015-07-01 09:48:55 +02:00
a0e7a60973
Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
...
Conflicts:
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
GraphicsView/demo/Generator/CMakeLists.txt
GraphicsView/demo/GraphicsView/CMakeLists.txt
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
GraphicsView/demo/Triangulation_2/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Mesh_3/demo/Mesh_3/CMakeLists.txt
Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_plane_item.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
ba9cf09f03
Do not compute ${lib}_LIBRARY_INSTALLED anymore
...
CGALConfig_installed.cmake does not use that variable anymore
2015-06-29 16:36:50 +02:00
6b4acda559
Add Advancing Front Reconstruction to changes.html
2015-06-29 12:23:55 +02:00
76cf7e789f
Merge remote-tracking branch 'cgal/releases/CGAL-4.6-branch'
...
- Merge pull request #140 from
lrineau/Mesh_3-demo_fix_QGLViewer-2.6.0-lrineau
Fix for libQGLViewer>=2.6.0
Conflicts:
Installation/changes.html
2015-06-28 18:25:04 +02:00
9c37e3f1e8
Merge pull request #134 from bo0ts/Installation-fix-debugsymbol-removal-pmoeller
...
Do not check for the actual CMAKE_BUILD_TYPE
2015-06-28 18:20:39 +02:00
b4875fc99a
changes for CGAL-4.6.1
2015-06-25 14:58:30 +02:00
d4b4e1720b
Merge branch 'releases/CGAL-4.6-branch'
...
This merge imports the following merge commits:
- Merge pull request #132 from lrineau/Installation-fix_configure_component-pmoeller_rebased_4.6
- Merge pull request #126 from afabri/Triangulation_2-fix_plus_2-GF
- Merge pull request #125 from lrineau/Mesh_3-fix_with_gcc44_cpp11-lrineau
2015-06-25 11:28:30 +02:00
c95fd5d289
Do not compute ${LIBRARY_NAME}_LIBRARY anymore
2015-06-24 17:25:11 +02:00
e7a6f80f05
Check for MSVC when defining library paths
...
We do not know the value of CGAL_AUTO_LINK_ENABLED yet because it is
defined by CGAL_GeneratorSpecificSettings.cmake but this is
equivalent. This is also not a problem, because CGAL_AUTO_LINK_ENABLED
is not user-editable and always enabled on MSVC.
2015-06-24 17:21:37 +02:00
f0082c20f4
To not check for the actual CMAKE_BUILD_TYPE
...
If CMAKE_BUILD_TYPE is not set in the initial run, is only
defined *after* this code is run. Since the build type is cached this
seemed to work when a cmake cache was already present, but not without.
2015-06-24 11:39:47 +02:00
3e0ce823ca
Do not compute ${LIBRARY_NAME}_LIBRARY anymore
...
Fixes #47
2015-06-23 17:59:48 +02:00
8b6acec1b3
Use the LOCATION property to set _LIBRARY variables
...
Inspect the imported targets for information instead of using
configure_file.
2015-06-23 17:59:48 +02:00
9e807d8e2d
Include the export files through CGALConfig
2015-06-23 16:30:46 +02:00
8f7e338f33
Create a build-tree and installation export file
...
Add an export-name to libraries created with collect_cgal_library and
use it in install(EXPORT). Fake the behavior of export(EXPORT) by
looking for created targets manually.
2015-06-23 16:27:58 +02:00
06a17381a6
Fix the use of get_filename_component
...
For CMake<=2.8.11, the option DIRECTORY must be renamed to PATH, the
legacy name of the option.
2015-06-23 11:22:01 +02:00
61e61220eb
Use get_filename_component to manipulate paths
...
This caused a bug in CMake>=3.3.0 when file(GLOB) is not adding multiple
slashes. The lack of trailing slashes is guaranteed and documented in
get_filename_component.
2015-06-23 11:13:09 +02:00
de7db3ca68
Merge pull request #111 from aympelle/Periodic_3_Delaunay_triangulation_traits_3-APelle
...
- Rename `Periodic_3_triangulation_traits_3` to `Periodic_3_Delaunay_triangulation_traits_3`.
- Rename the concept `Periodic_3TriangulationTraits_3` to `Periodic_3DelaunayTriangulationTraits_3`.
- Create `Periodic_3_triangulation_traits_3`.
- Create the concept `Periodic_3TriangulationTraits_3`.
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/rename_p3tt3_p3dtt3
2015-06-17 09:59:33 +02:00
cce0d3ec64
Merge pull request #100 from sloriot/gsoc2014-Polyhedron_shortest_path-skiazyk
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polyhedron_shortest_path
This package provides methods to compute the surface-constrained shortest path on 3d models. It was written as a project during GSoC 2014.
2015-06-15 10:45:25 +02:00
71207cac07
Merge pull request #116 from sloriot/gsoc2014-VCM_3-jmeyron
...
GSoC 2014, VCM feature from Jocelyn Meyron, Sébastien Loriot, and Quentin Mérigot
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/vcm_computation_and_applications
2015-06-15 10:37:29 +02:00
447c5fd2af
Merge pull request #69 from efifogel/MS_2-of_holes-efif
...
Add in `Minvoski_sum_2`:
- handling of polygons with holes,
- the new "reduced convolution" implementation.
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Minkowski_sum_2_polygons_with_holes_and_RC
2015-06-10 12:24:00 +02:00
6dc9d60577
Merge pull request #114 from bo0ts/Installation-nodebug_when_testing-pmoeller
...
Remove the -g flag in testsuites (when `RUNNING_CGAL_AUTO_TEST` is `TRUE` in CMake).
2015-06-10 12:02:08 +02:00
40c629a3b4
Merge pull request #90 from janetournois/Mesh_2-add_optimizers-GF
...
Add optimizer methods in Mesh_2
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/lloyd_optimize_mesh_2
2015-06-10 11:57:53 +02:00
661ec3f606
Merge pull request #101 from afabri/Ridges_3-BGL-GF
...
Make `Ridge_3` work for any `FaceGraph` (concept from our BGL API).
2015-06-10 11:52:37 +02:00
8df781d3da
Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin
2015-06-09 14:56:48 +02:00
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
79845d2b9c
Disable auto_link in header-only mode
2015-03-27 15:59:43 +01: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
ed3113f89d
Code clean-up
2015-03-16 17:01:49 +01:00
9c78897ba5
Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin
2015-03-16 14:00:43 +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
e18e59a72a
Header-only for package Kinetic_data_structures
2014-12-02 20:41:19 +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
Guillaume Damiand
Simon Giraudot
Sébastien Loriot
Sebastien Loriot
Laurent Rineau
Jane Tournois
Monique Teillaud
Philipp Moeller
Philipp Möller
Aymeric PELLE
Clement Jamin
Marc Glisse
Sandeep Kumar Dey
Michael Hemmer
Maxime Gimeno
Efi Fogel
Laurent Rineau
Remy Thomasse
Sylvain Brandel
Dmitry Anisimov
m.overtheil
Aurélien Vialon