Maxime Gimeno
6584abd90b
Use integrated qglviewer for 3D demos
2018-05-17 10:20:55 +02:00
Andreas Fabri
c54a6a4980
Put CGAL::random_shuffle() in the subnamespace cpp98
2018-04-11 09:32:23 +01:00
Andreas Fabri
3955f031bd
Fix examples/tests/demos
2018-04-04 14:18:22 +01:00
Sébastien Loriot
01af331c72
use https for all links to www.cgal.org and doc.cgal.org
2018-03-14 15:59:38 +01:00
Maxime Gimeno
86ec93aa25
Remove Qt5::Help from CMakeLists because it causes errors and it is not used.
2018-02-08 09:18:04 +01:00
Laurent Rineau
6ec4c12031
Do not use OpenGL directly, but only using Qt5 OpenGL classes
2017-11-28 17:58:12 +01:00
Laurent Rineau
25dffa1710
Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED
2017-11-17 12:54:13 +01:00
Laurent Rineau
bbee705221
Add compilation tests for demos
2017-11-16 18:38:15 +01:00
Laurent Rineau
62c70d41ca
Renew the handle of policies, for CMake-3.10
...
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.
`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
2017-11-06 14:58:36 +01:00
Sébastien Loriot
9bb2d4433f
Merge remote-tracking branch 'cgal/releases/CGAL-4.10-branch'
2017-08-04 13:37:58 +02:00
Maxime Gimeno
831f0239cb
Fix CMP0071 warning.
2017-08-03 10:38:19 +02:00
Laurent Rineau
871bba21f6
Merge pull request #2212 from MaelRL/Periodic_3_Regular_triangulation_3-APelle
...
Add periodic regular triangulations
2017-07-17 12:23:54 +02:00
Maxime Gimeno
51f7218c2a
FIx Lloyd demo for QGLViewer 2.7
2017-07-10 16:11:09 +02:00
Maxime Gimeno
3a97734a70
fix T3 demo for QGLViewer v2.7.0
2017-07-10 16:11:09 +02:00
Maxime Gimeno
82f39dadbf
FIx Lloyd demo for QGLViewer 2.7
2017-07-03 09:35:14 +02:00
Maxime Gimeno
9bf422ad5b
fix T3 demo for QGLViewer v2.7.0
2017-07-03 09:35:14 +02:00
Mael Rouxel-Labbé
5955f9c7c0
Merge branch 'Periodic_3_Regular_triangulation_3-APelle-old' into Periodic_3_Regular_triangulation_3-APelle
...
Based on Kernel_Weighted_point_without...
@ 67c531af53
2017-06-08 14:37:26 +02:00
Maxime Gimeno
5ae96fc2aa
Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found.
2017-05-23 16:12:56 +02:00
Mael Rouxel-Labbé
2cd9121c14
Fixed compilation of P3 demo
2017-05-16 14:25:09 +02:00
Sébastien Loriot
e78bef8a9c
update project name of demos
2016-09-08 00:13:34 +02:00
Guillaume Damiand
e394b71791
Link with glu in demos Periodic_3_triangulation_3 and Periodic_Lloyd_3
2016-06-03 15:11:03 +02:00
Guillaume Damiand
10469f9c4e
Update with master
2016-05-25 10:58:55 +02:00
Maxime Gimeno
524a8da107
Remove glu from all the CMakeLists
2016-04-14 09:29:50 +02:00
Clement Jamin
f2c68b25cd
Update CMakeLists.txt of all demos for header-only mode
2016-03-09 17:23:20 +01:00
Maxime Gimeno
0a37521263
Revert "Fix for the context"
...
This reverts commit 552aaa159f .
Conflicts:
Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
2016-02-11 14:16:04 +01:00
Maxime Gimeno
552aaa159f
Fix for the context
2016-02-09 14:48:26 +01:00
Sébastien Loriot
e211843b4f
Merge pull request #654 from maxGimeno/FixForMac-GF
...
Demo fix for OS X (fix for #437 )
2016-02-03 14:39:48 +01:00
Maxime Gimeno
5a427a85b3
Addition of the SGI FREE SOFTWARE LICENSE B in the Scene.cpp file.
2016-02-01 12:18:40 +01:00
Maxime Gimeno
9abf38bfce
warning fix
...
- replaced gluErrorString by its source code in Mesh_3
- replaced gluProject by its modified source code in P3T3
- deleted volume_planes files in Polyhedron/demo/Polyhedron, as the real ones are in Plugins/Mesh_3_plugin
2016-02-01 09:02:36 +01:00
Maxime Gimeno
d71d959a0e
FIx for mac
2016-01-20 09:39:35 +01:00
Laurent Rineau
4463e53d0a
Revert "add a dependency on the Qt5::QSQLiteDriverPlugin"
...
This reverts commit 156b267d85 .
Conflicts:
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
The reason is that our demo does not depend on QtSql or any QtSql
plugin. For details, see:
https://github.com/CGAL/cgal/issues/254#issuecomment-132605984
2015-08-19 15:57:35 +02:00
Laurent Rineau
c9f16f8984
Define the OpenGL functions typedefs
...
- PFNGLDRAWARRAYSINSTANCEDARBPROC
- PFNGLVERTEXATTRIBDIVISORARBPROC
Definitions found in glext.h from Mesa.
2015-08-18 18:46:02 +02:00
Maxime Gimeno
95f87a3ac5
Depth test problem fix
...
- Calling glEnable(GL_DEPTH_TEST) in the beginning of every draw should solve this problem.
2015-08-13 14:08:12 +02:00
Maxime Gimeno
88e41a6bf7
Mesa Fix :
...
- context set to 2.1
- shaders versions set to 120
2015-08-10 11:17:24 +02:00
Maxime Gimeno
4c37b2d80a
Mesa Fix :
...
- context set to 2.1
- shaders version set to 120
- instanced rendering managed with ARB extension
- if extension cannot be found, the wireframe mode is forced.
2015-08-10 11:07:04 +02:00
Sébastien Loriot
16da0d60ea
readd QUIET to be consistant with other packages
2015-08-07 14:40:01 +02:00
Sébastien Loriot
156b267d85
add a dependency on the Qt5::QSQLiteDriverPlugin
2015-08-07 14:37:57 +02:00
Laurent Rineau
e9b8d6275b
Merge pull request #239 from lrineau/CGAL-Fix_demos_with_Qt_5.2-GF
...
Support Qt-5.2
The use of `QApplication::setAttribute(Qt::AA_UseDesktopOpenGL);` is only for Qt>=5.3.
2015-08-05 10:57:08 +02:00
Laurent Rineau
55c30d0808
Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only
2015-08-04 10:55:26 +02:00
Laurent Rineau
c6e8f8baa2
Do not build the demo when WITH_CGAL_Qt5=OFF
2015-08-03 17:09:52 +02:00
Laurent Rineau
cb0bdd3ad2
Remove warnings about unused moc files
...
Should fix #194 .
2015-08-03 16:27:28 +02:00
Laurent Rineau
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
Laurent Rineau
04db43556f
Do not warn when Qt5 is not found.
2015-07-13 15:55:41 +02:00
Laurent Rineau
15c1469a54
CGAL requires CMake>=2.8.11.
2015-07-10 17:01:42 +02:00
Laurent Rineau
3ec0c69f8f
We want 2.8.10 for all demos
...
Previous versions are not tested by the CGAL daily test suite.
2015-07-09 17:50:22 +02:00
Andreas Fabri
2daae8eb1b
static_casts
2015-07-09 16:18:01 +02:00
Laurent Rineau
ede49f1b48
Fix a warning -Wnarrowing
2015-07-08 16:00:01 +02:00
Laurent Rineau
f17d91f4e3
Fix warnings about unused variables/local types/local functions
2015-07-08 15:01:36 +02:00
Maxime Gimeno
76a1911042
A viewer to specify the OpenGL context for QGLViewer's constructor
2015-07-08 13:10:11 +02:00
Maxime Gimeno
278e9d9829
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
...
Conflicts:
Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
2015-07-08 12:40:14 +02:00
Maxime Gimeno
f76bb19734
Windows fix
...
- add an attribute at the application in the main() function
- add a custom context to the viewer
2015-07-08 12:16:51 +02:00
Sébastien Loriot
1d4358e052
update qt urls
2015-07-08 09:48:45 +02:00
Sébastien Loriot
e199f546d4
remove QT4 specific code
2015-07-07 19:36:04 +02:00
Sébastien Loriot
722abba27b
cosmetic changes to remove mentions of QT4
2015-07-07 18:00:43 +02:00
Sébastien Loriot
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
Maxime Gimeno
4a2e163620
Changed() fixed
2015-07-07 09:49:10 +02:00
Maxime Gimeno
7b95334c69
Changed fixed.
2015-07-07 09:44:50 +02:00
Laurent Rineau
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
Maxime Gimeno
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
Laurent Rineau
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
Andreas Fabri
c5d196f78c
remaining demos
2015-05-06 18:53:44 +02:00
Maxime Gimeno
ba4ede5f50
Clean-up
...
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
2015-04-24 12:54:05 +02:00
Maxime Gimeno
b01dbe1f2d
Addition of a destructor.
...
- Added a destructor to take care of the buffers and VAOs.
2015-04-16 09:48:06 +02:00
Maxime Gimeno
978885384c
Upgrade of periodic_Lloyd_3_demo
...
- Implementation of shader rendering
- suppression of the function gl_draw_surface
2015-04-16 09:17:20 +02:00
Maxime Gimeno
9fb08ad647
End of deletion of the useless functions
...
-deleted remaining references to make_draw_list that made the program crash
2015-04-15 13:07:24 +02:00
Maxime Gimeno
a45d2fc063
Upgrade of Periodic_triangulation_3_demo
...
- Had to create cylinders from scratch to replace glu
- Had to redo every transformation calculation to fit my cylinder model
- Had to replace the length of a tube by a scaling to be able to use instanced rendering
2015-04-15 12:52:39 +02:00
Maxime Gimeno
85c8e7e270
Upgrade of AABB_Tree Demo to Qt5
...
- setBackgroudColor was called too soon(in the constructor of the viewer), now called in InitializeGL
2015-04-02 11:54:06 +02:00
Maxime Gimeno
2e47961cce
Successfully upgraded to Qt5.
2015-04-01 13:40:02 +02:00
Maxime Gimeno
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
Aymeric PELLE
caa3164db5
Rename Periodic_3_triangulation_traits_3 Periodic_3_Delaunay_triangulation_traits_3.
...
Classes Periodic_3_triangulation_traits_3 and
Periodic_3_triangulation_traits_base_3 are renamed.
Tests, examples, ... are updated.
Doc is updated.
Periodic_3_triangulation_traits_3.h is set deprecated.
2014-11-26 18:23:21 +01:00
Aurélien Vialon
df9e315536
Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.
2014-08-15 02:57:48 +02:00
Aurélien Vialon
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
Aurélien Vialon
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
Laurent Rineau
283807572f
restore correct permissions (not-executable)
2014-08-01 10:32:42 +02:00
Aurélien Vialon
a3a84ce2e8
Fix attempt of git problem + Periodic_3_triangulation_3 and Periodic_Llyod_3 demonstrations ported.
2014-07-11 19:22:13 +02:00
Aurélien Vialon
ab909badb9
Demonstrations AABB_tree, Alpha_shapes_3 and Circulat_kernel_3 ported. Working on Mesh_3, Polyhedron and Periodic_3_triangulation_3.
2014-07-03 15:07:00 +02:00
Laurent Rineau
e4b033e964
Add/remove #include
...
- I remove <CGAL/basic.h> when I see it, in favor of <CGAL/config.h>.
- <CGAL/ipower.h> is needed for CGAL::ipower
- <ctime> is needed for std::time
2014-06-26 19:10:06 +02:00
Sébastien Loriot
746dacc210
periodic_3 demo does not compile if qcollection_generator is not here.
2013-05-21 17:20:25 +02:00
Andreas Fabri
278c1fe6d4
Add an 'f' to a float
2013-02-14 13:16:20 +01:00
Andreas Fabri
dfea9e77dc
Add a 'f' after a number
2013-02-09 16:24:57 +01:00
Andreas Fabri
21fd50eeb7
Add a static_cast
2013-02-09 16:23:42 +01:00
Andreas Fabri
c029f702a3
use more types
2013-02-07 11:02:14 +01:00
Philipp Möller
1adf441b18
Convert all CRLF files to LF
2012-12-03 18:44:24 +01:00
Laurent Rineau
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
Laurent Rineau
e534c42e1c
Fix the detection of qcollectiongenerator
2012-02-24 12:24:01 +00:00
Sébastien Loriot
20ee8d187d
do not compile if qcollectiongenerator is missing
2012-02-04 10:34:16 +00:00
Laurent Rineau
5b5dd33848
merge changes from next
2012-01-09 12:33:39 +00:00
Laurent Rineau
c7ca93c07e
Include <CGAL/glu.h> before any use of GLU
2011-11-09 14:24:17 +00:00
Laurent Rineau
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
Laurent Rineau
78b2f8ba39
Remove the use of QT ASSISTANT in CMakeLists.txt (not actually used)
2011-06-14 14:02:42 +00:00
Laurent Rineau
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
Laurent Rineau
0dc1194fc8
Fix URLs to the manual pages
2011-04-28 15:14:20 +00:00
Laurent Rineau
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
Laurent Rineau
0631943153
Uniform capitalization in our CMake script: use lowercase for commands
2011-04-28 10:36:18 +00:00
Laurent Rineau
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
Laurent Rineau
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
Laurent Rineau
efb2c205a3
- Fix the Qt Help Collection stuff:
...
- CMakeLists.txt is changed (now that FindQt4.cmake has been update to
the version shipped with CMake-2.8.1,
- the .qhcp files have been updated, so that the first URL is correct.
- Use embedded resources in demo/Periodic_3_triangulation_3/MainWindow.h,
so that the resources are found even if the build/install directory is
out of sources.
2010-08-02 14:51:09 +00:00
Manuel Caroli
4bb914994b
the demo's help now uses QProcess to call the qt assistant
...
instead of using the deprecated QAssistantClient
2010-07-11 19:45:18 +00:00
Manuel Caroli
7418d1bf73
put the collection files to the demo's root directory so they can access the icons
2010-07-11 19:26:06 +00:00
Manuel Caroli
32e9308ea2
remove generated binary files from svn
2010-07-11 19:21:33 +00:00