Commit Graph

154 Commits

Author SHA1 Message Date
Andreas Fabri f864b0a8e8 fix line width in demos using GraphicsView 2015-07-28 15:46:11 +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
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
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 60b47f0978 Succesfully upgraded to Qt5 2015-04-01 12:18:59 +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
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 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
Aurélien Vialon 2d65524aea All last demonstrations ported to Qt4or5. Need to check working of it on Linux. 2014-08-12 22:12:42 +02:00
Aurélien Vialon 2826df7237 Correction of Windows platforms bug about CGAL libraries not considered. 2014-07-22 19:07:34 +02:00
Aurélien Vialon aee9e4eb24 Commit of new demonstrations porting. 2014-06-26 14:38:23 +02:00
Sébastien Loriot 82b2ebc865 apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +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 4c3e1c3138 Fix mixed eol styles 2012-08-02 13:35:03 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +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
Philipp Möller 8eb30ef805 Replaced all uses of predecessor/successor with prev/next. 2011-06-07 16:21:58 +00:00
Sébastien Loriot 659dcd26b3 is_rational() from one_root_number is replaced by !is_extended() from Sqrt_extension 2011-05-02 10:13:35 +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 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 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
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
Marc Glisse e54d65ec06 Don't rely on the implicit conversion QString -> const char*.
Don't do it on temporaries.
stddef.h missing in qt3 headers.
2010-07-12 10:02:56 +00:00
Marc Glisse c95671e5a7 cleanup extra ';' 2010-04-24 09:01:22 +00:00
Fernando Cacciola a6395f99a8 Refactor double approximations on bezier handling 2010-03-05 20:47:52 +00:00
Efi Fogel d2f3ef9513 cleanup 2010-03-03 12:37:20 +00:00
Andreas Fabri 677070aa36 get rid of Ctrl M 2010-02-02 14:41:41 +00:00
Fernando Cacciola 710cb1172c Added missing icons 2010-02-02 14:24:50 +00:00
Fernando Cacciola b4f28b72b0 Misc fixes 2010-01-29 17:44:46 +00:00
Fernando Cacciola 3d30e462ea Entering circular polygons being added 2010-01-29 05:05:23 +00:00
Fernando Cacciola 031b518c7a Entering circular polygons being added 2010-01-29 02:43:23 +00:00
Fernando Cacciola 69fc0a44f2 Entering circular polygons being added 2010-01-27 18:58:29 +00:00
Fernando Cacciola e1f2cf34dc Entering circular polygons being added 2010-01-27 17:53:55 +00:00
Fernando Cacciola b58ebd3f74 Entering circular polygons being added 2010-01-27 17:09:17 +00:00
Fernando Cacciola 9b28a02483 Entering circular polygons being added 2010-01-27 14:51:56 +00:00
Fernando Cacciola e1c4130c0d Entering circular polygons being added 2010-01-26 17:05:09 +00:00
Fernando Cacciola 5e6b0c3704 Fixed compiler error in Qt4 demo - Added missing samples 2010-01-15 22:40:53 +00:00
Fernando Cacciola 0fdb02445e Rendering fixes 2009-12-22 20:32:38 +00:00
Fernando Cacciola 6a7a8c9e0c Fixes in the save code 2009-12-18 16:47:24 +00:00
Fernando Cacciola 6cf035c3ad Added ability to save the 'source' of a bezier instead of its decomposition on X-monotone sub-curves 2009-12-16 15:44:32 +00:00
Fernando Cacciola 95abf99c8b Added samples that show the mismatch between input and result 2009-12-15 18:12:03 +00:00
Fernando Cacciola c069f7dec0 Additional fixes on the circular arc drawer 2009-12-08 19:33:10 +00:00
Fernando Cacciola 131cbcf746 another dxf subsample added 2009-12-08 17:15:55 +00:00
Fernando Cacciola 251677188f (really) Fixed circular arc drawer 2009-12-08 16:42:35 +00:00