743569f854
Also disable WKT if gcc version is <4.5
2019-01-09 16:32:08 +01:00
3b1b6e2401
Merge remote-tracking branch 'cgal/master' into Graphics_view-Fix_demo_IO-GF
2019-01-09 12:35:04 +01:00
d6cfa1a868
Fix CMake warnings about CMP for Visual 2017
2018-11-21 16:17:39 +01:00
080f63b1b8
Disable WKT for boost < 1.56
2018-11-07 11:58:50 +01:00
ef771d0f97
Re-add include({CGAL_USE_FILE}) is demo with core or image io, and set(CMAKE_INCLUDE_CURRENT_DIR ON) in others.
2018-10-19 09:51:14 +02:00
0bd9088b5a
Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required.
2018-10-17 14:17:08 +02:00
7f09308d33
Remove all include_directories(BEFORE ../../include) in CMakeLists.txt
2018-10-17 13:07:22 +02:00
a7c5c92f2f
Check for CMakeLists.txt also in demos
2018-10-16 12:42:49 +02:00
df980abff6
Add WKT IO to 2D demos and add saving to stream_lines_2_demo
...
Also adds traits for Point_3 to be able to interract with weighted points through them.
2018-05-15 10:04:23 +02:00
01af331c72
use https for all links to www.cgal.org and doc.cgal.org
2018-03-14 15:59:38 +01:00
891a83840e
Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF
2017-11-17 15:03:57 +01:00
25dffa1710
Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED
2017-11-17 12:54:13 +01:00
21dabf1b1b
Add compilation tests for demos
2017-11-16 18:45:33 +01:00
bbee705221
Add compilation tests for demos
2017-11-16 18:38:15 +01:00
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
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
e78bef8a9c
update project name of demos
2016-09-08 00:13:34 +02:00
f2c68b25cd
Update CMakeLists.txt of all demos for header-only mode
2016-03-09 17:23:20 +01:00
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +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
1d4358e052
update qt urls
2015-07-08 09:48:45 +02:00
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
ad4a0169fb
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-07-07 11:26:47 +02:00
84dfabf3b4
remove REQUIRED keyword for CGAL_Qt5 in demos
...
The handling should be with a status message
2015-07-07 11:23:46 +02:00
c0149c727f
static_casts
2015-07-07 11:00:37 +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
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
8e393c792c
Graphicsview demos
2015-05-06 17:11:04 +02:00
65061d2c4a
Upgrade to Qt5
2015-04-01 14:54:24 +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
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +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
520e791a99
GraphicView demonstrations porting.
2014-07-09 16:31:29 +02:00
6ac85b1b27
remove unused variable
2013-03-01 16:35:23 +01:00
84a7061b15
remove unused parameter name
2013-02-28 16:40:57 +01:00
2db4effa7e
CMake: Fix the handling of cmake_policy
...
That is a followup-to my commit last year:
| ------------------------------------------------------------------------
| r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
|
| Try to fix my last revision about cmake_policy, with CMake-2.6.x
|
| CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
| x.y.z is greater than the current CMake version.
|
| ------------------------------------------------------------------------
The following check:
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
cmake_minimum_required(VERSION 2.6.2)
The script used to fix that was:
#!/usr/bin/env perl
$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
cmake_policy(VERSION 2.8.4)
else()
cmake_policy(VERSION 2.6)
endif()
END
while(<>) {
if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
while(<>) {
if(/^endif\(\)/) {
print "$replacement";
while(<>) {
print;
}
exit 0
}
}
}
print;
}
2012-08-22 12:35:03 +00:00
88ef561715
Fix the call to Q_INIT_RESOURCE
...
For resources that are shipped by the CGAL_Qt4 library, one need to call
CGAL_QT4_INIT_RESOURCES, a macro that calls CGAL_Qt4_init_resources
(exported by the CGAL_Qt4 DLL)
2011-10-11 09:51:29 +00:00
3c02e07b23
Try to fix my last revision about cmake_policy, with CMake-2.6.x
...
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
2011-04-28 17:45:22 +00:00
c97205f085
Global handling of CMake policies (second part)
...
We declare
cmake_minimum_required(VERSION 2.6.2)
but we also use
cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.
That way, we no longer need any declaration of specific policies.
Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
ca5c92e034
Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
...
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
- change cmake_minimum_required to VERSION 2.6.2
- no longer any need for the policy CMP0003 (was for 2.4.x)
- no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 17:58:27 +00:00
181646f64b
Add some QT_USE_.. as this is the only difference I see to the Alpha shapes demo which finds Qt4 in the 3.8-I-39 testsuite
2010-09-27 11:28:10 +00:00
3dc854d29c
const QString& -> QString
2010-08-23 10:46:15 +00:00
225672765a
Backport from trunk:
...
| ------------------------------------------------------------------------
| r57993 | lrineau | 2010-08-11 18:02:00 +0200 (Wed, 11 Aug 2010) | 5 lines
|
| Massive change in all .qrc files: the attribute lang= must not be used. It
| must be only used to create an alternative for another lang. If a resource
| exists only with lang=, then that resource will not be found if the locale
| had not that language.
|
| ------------------------------------------------------------------------
2010-08-11 16:03:25 +00:00
af3ad196a0
Global fix of all uses of qt4_generate_moc: the destination file path must be absolute.
2010-08-11 13:24:20 +00:00
4e7c43310e
Remove svn:executable property
2009-09-19 05:36:12 +00:00
24f08fc681
Added demos to the demos target
2008-12-18 17:29:36 +00:00
092b565600
Remove debug output
2008-12-05 16:33:38 +00:00
5d49d36127
- Fix conditionnal compilation: test CGAL_Qt4_FOUND.
...
- Re-indentation.
- Use ${QT_USE_FILE} *after* QT4_FOUND is tested.
2008-11-20 13:28:52 +00:00
4032eade9a
Massive removale of "QUIET" in find_package calls (except for
...
FindVTK.cmake, which has a bug). Let's see if that can help us to find out
why we still have problems with demos on MacOS and Windows.
2008-11-19 13:58:43 +00:00
Maxime Gimeno
Guillaume Damiand
Laurent Rineau
Sébastien Loriot
Clement Jamin
Andreas Fabri
Aurélien Vialon
Laurent Rineau
Sylvain Pion
Fernando Cacciola