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
7e041bcc50
move to place holder
2015-07-07 15:58:58 +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
Sébastien Loriot
Laurent Rineau
Andreas Fabri
Philipp Möller
Sebastien Loriot
Clement Jamin
Marc Glisse