songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
99,370 Commits 3 Branches 156 Tags 962 MiB
Commit Graph

112 Commits

Author SHA1 Message Date
Andreas Fabri c0149c727f static_casts 2015-07-07 11:00:37 +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
Andreas Fabri 8e393c792c Graphicsview demos 2015-05-06 17:11:04 +02:00
Maxime Gimeno 65061d2c4a Upgrade to Qt5 2015-04-01 14:54:24 +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
Laurent Rineau 29904d2f56 Other example with the Polygon demo 2014-11-07 17:06:41 +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 520e791a99 GraphicView demonstrations porting. 2014-07-09 16:31:29 +02:00
Laurent Rineau 59d3dd8793 Do not require GMP explicitly 2014-07-02 12:58:50 +02: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 a7a89c25b7 add_dependencies( Polygon_2 ${CGAL_LIBRARY} ) is useless 
Ar the target Polygon_2 links with the CGAL library, CMake already creates
a dependency.
 2012-07-31 16:18:17 +00:00
Eric Berberich b6e350ccfa removed old verbose output 2012-06-11 22:24:22 +00:00
Eric Berberich 463a030267 removed old verbose output 2012-06-11 22:23:28 +00:00
Eric Berberich 832c6c02e7 merge from next; installation.tex got major changes 2012-01-23 13:54:58 +00:00
Andreas Fabri 77f3648287 Fix for Windows 'min/max' bug 2012-01-18 12:02:15 +00:00
Eric Berberich 66bc1cef1e merge from next 2012-01-09 12:42:00 +00:00
Laurent Rineau 5946c69608 merge from next 2011-10-12 13:52:06 +00:00
Andreas Fabri 94191c33e7 fix a memory leak 2011-10-12 12:37:45 +00:00
Andreas Fabri 7566f2cdcc Max area k-gon is implemented for k=3; Additionally the input must be convex 2011-10-12 11:08:33 +00:00
Andreas Fabri 1211b00e3b bug fix: Check if item exists before removing it 2011-10-12 11:04:19 +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 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 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 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
Eric Berberich 987c9bbcd5 added Minkowski sum with itself (AF has accepted this extension) 2010-12-20 14:15:46 +00:00
Andreas Fabri 818e9909f6 Add max area k-gon 2010-09-23 15:58:54 +00:00
Fernando Cacciola 72ed56006a Reverting to release 3.6 2010-08-19 05:06:11 +00:00
Andreas Fabri 4b7f51399f Add drag and drop 2010-08-13 15:05:34 +00:00
Laurent Rineau 9204de7204 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:02:00 +00:00
Laurent Rineau a968f82c31 Fix CMake error! 2010-08-10 15:12:49 +00:00
Andreas Fabri fb6db200b5 Having a rubberband polygon without a key modifier pressed needs mouseTracking switched on 2010-08-06 13:03:15 +00:00
Laurent Rineau 1dfbb1f9a9 Fix the CMakeLists.txt: 
- use CORE if available, do not fail otherwise
  - fix an out-of-sources compilation error.
 2010-08-06 12:35:32 +00:00
Fernando Cacciola d631ea562f Added ability to load weighted polygons (.wsl) and produce skeletons and offsets accordingly. 2010-07-29 07:06:22 +00:00
Fernando Cacciola 3cce7075fe Fixed incorrect dialog parameter error 2010-02-02 14:51:40 +00:00
Fernando Cacciola caf5fa0883 Added offsetting demo 2009-07-06 16:11:03 +00:00
Fernando Cacciola 24f08fc681 Added demos to the demos target 2008-12-18 17:29:36 +00:00
Laurent Rineau c64c0df177 The polygon demo needs Core. 2008-12-05 13:09:44 +00:00
Andreas Fabri 27fa91ac1e Remove an action equivalent to 'Clear' 2008-12-03 18:30:40 +00:00
Laurent Rineau 226b66183b Check all CGAL components. 
Remove QUIET.
Re-indent.
 2008-11-19 13:19:19 +00:00
Andreas Fabri 40e63c3bde Removed textoutput, Edit, and renamed Tools to Algorithms 2008-11-09 15:56:06 +00:00
Fernando Cacciola 547bffecd9 Put CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS in the right place for cmake 2.4 2008-11-06 13:03:41 +00:00
Fernando Cacciola 70fa9503fd Added CMP0003 policy 2008-11-04 12:30:29 +00:00
Andreas Fabri 13f3e2bf65 lowercased file name 2008-10-25 09:15:08 +00:00
Andreas Fabri 408c91201a Add load/save polygon 2008-10-17 18:28:22 +00:00
Andreas Fabri 822bd15b47 Add fitting of a line through segments 2008-10-17 18:12:58 +00:00
Andreas Fabri 9f149a3ab5 fix bounding rect 2008-10-17 17:13:29 +00:00
Andreas Fabri 2cbb027eb3 Add PCA (Atttention it is buggy) 2008-10-15 15:01:18 +00:00
Andreas Fabri d2dd28b7fb Forgot to expresss dependency on the moc file 2008-10-07 07:46:36 +00:00
Laurent Rineau 15d289b287 Add CGAL_Core to the polygon demo (because that demo includes Straits 
Skeleton, which uses CORE for internals predicates).
 2008-10-03 08:36:23 +00:00
Andreas Fabri c67608d37f Added two more partition methods to the demo 2008-10-01 19:37:31 +00:00
Andreas Fabri 53f44636bf Added inner skeleton and I/O 2008-10-01 15:58:17 +00:00
Andreas Fabri a0fbf53105 Conditional compilation 2008-10-01 10:45:10 +00:00
Andreas Fabri ba7fcaa5f2 Renamed actionExit to actionQuit 2008-09-30 14:45:34 +00:00
Andreas Fabri f42e4df167 Added partition 2008-09-26 16:27:55 +00:00
Laurent Rineau f1b56f9a11 Fix some CMakeLists.txt (that use Qt3 or Qt4). 2008-09-22 11:59:21 +00:00
Laurent Rineau 1266312e32 Followup of previous commit ("Add auto-link to libCGALQt4 files."). 
Now use auto-link in demos that use CGAL Qt4 support.
 2008-09-05 16:04:07 +00:00
Laurent Rineau b6dae9c417 - Change svn:ignore of the directory (files generated by CMake). 
- Change the horizontalStretch of the two central widgets (2/3, 1/3).
 2008-07-11 13:25:51 +00:00
Laurent Rineau 14ca3447e5 Fix: Logos.qrc no longer exists. Use CGAL.qrc instead. 2008-07-11 13:09:58 +00:00
Andreas Fabri 6bd3e07953 Add Polygon Demo 2008-07-08 21:48:06 +00:00