Commit Graph

364 Commits

Author SHA1 Message Date
Sébastien Loriot 806ee2b9a4 fix typos 2011-05-17 08:48:01 +00:00
Sébastien Loriot a8fdc3c31b typos 2011-05-16 13:37:47 +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
Marc Glisse 154a2dd729 Revert last commit, sorry 2011-03-13 11:42:28 +00:00
Marc Glisse fab4d9c26c add missing operator 2011-03-12 09:59:43 +00:00
Sébastien Loriot 0ebdccfa4e update URL and Id tag 2011-03-02 14:59:51 +00:00
Laurent Rineau da95064578 Update the \ccPkgHowToCiteCgal tag for CGAL-3.8 (2011). 2011-02-24 15:21:10 +00:00
Laurent Rineau cdf0322256 Let's remove all makefiles, now. 2010-08-23 11:03:02 +00:00
Laurent Rineau cdfca79cb8 Modify the test file so that the check function do not display warnings
that result in a 'w' in the testsuite.
2010-08-20 09:39:25 +00:00
Laurent Rineau 0b83562ef1 Backport from trunk, fixes to the testsuite:
| ------------------------------------------------------------------------
  | r58061 | lrineau | 2010-08-13 18:14:29 +0200 (Fri, 13 Aug 2010) | 8 lines
  | Changed paths:
  |    M /trunk/Boolean_set_operations_2/test/Boolean_set_operations_2/test_bop.cpp
  | 
  | Use a full-qualified name, because a of conflict with something from Boost.
  | 
  | Old error log:
  | /home/lrineau/CGAL/boost/1.44-beta1/include/boost/type_traits/has_new_operator.hpp: In function 'bool test_one_file(std::ifstream&)':
  | /home/lrineau/CGAL/boost/1.44-beta1/include/boost/type_traits/has_new_operator.hpp:24: error: 'template<class U, U x> struct boost::detail::test' is not a function,
  | /home/lrineau/CGAL/CGAL-3.7-I-135/cmake/platforms/x86-64_Linux-2.6_g++-4.4.4_F13-MATCHING-BUG-6/test/Boolean_set_operations_2/test_bop.cpp:137: error:   conflict with 'template<class Polygon1, class Polygon2> bool test(std::istream&, const Polygon1&, const Polygon2&)'
  | /home/lrineau/CGAL/CGAL-3.7-I-135/cmake/platforms/x86-64_Linux-2.6_g++-4.4.4_F13-MATCHING-BUG-6/test/Boolean_set_operations_2/test_bop.cpp:386: error:   in call to 'test'
  | 
  | ------------------------------------------------------------------------
  | r58062 | lrineau | 2010-08-13 18:19:37 +0200 (Fri, 13 Aug 2010) | 8 lines
  | Changed paths:
  |    M /trunk/Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp
  | 
  | Use a fully-qualified name for ::test, because otherwise there is a
  | conflict with something from Boost:
  | 
  | /home/lrineau/CGAL/boost/1.44-beta1/include/boost/type_traits/has_new_operator.hpp: In function 'int main()':
  | /home/lrineau/CGAL/boost/1.44-beta1/include/boost/type_traits/has_new_operator.hpp:24: error: 'template<class U, U x> struct boost::detail::test' is not a function,
  | /home/lrineau/CGAL/CGAL-3.7-I-135/cmake/platforms/x86-64_Linux-2.6_g++-4.4.4_F13-MATCHING-BUG-6/test/Min_sphere_of_spheres_d/interface_check.cpp:147: error:   conflict with 'template<int D, class FT, class Sqrt, class Alg> void test(int, const FT&)'
  | /home/lrineau/CGAL/CGAL-3.7-I-135/cmake/platforms/x86-64_Linux-2.6_g++-4.4.4_F13-MATCHING-BUG-6/test/Min_sphere_of_spheres_d/interface_check.cpp:210: error:   in call to 'test'
  | 
  | ------------------------------------------------------------------------
2010-08-18 20:59:25 +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
Laurent Rineau 7106e69e7a Fix keyword $URL$ and $Id$: "$URL: " and "$Id: " are not correct Subversion keywords 2010-06-29 12:47:18 +00:00
Efi Fogel c026b51fc5 Added missing authors 2010-06-28 13:35:40 +00:00
Ophir Setter 7dd0870ee0 fix compiliation in test_bop 2010-06-21 21:11:44 +00:00
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Efi Fogel 106fde756b removed obsolete workarround for VC++ and cleanup 2010-05-16 13:06:52 +00:00
Efi Fogel 538c021a16 added missing category 2010-05-04 08:38:00 +00:00
Marc Glisse c95671e5a7 cleanup extra ';' 2010-04-24 09:01:22 +00:00
Efi Fogel 3f8ff1a993 Eliminated a traits local variable 2010-04-13 10:43:55 +00:00
Eric Berberich 99aca56a46 refactored validation tests 2010-04-02 15:05:13 +00:00
Eric Berberich 7669478fb9 fixed variable name 2010-04-01 12:35:54 +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
Efi Fogel 2925887c93 cleanup 2010-03-02 22:06:14 +00:00
Efi Fogel 218b5b978e cleanup 2010-03-02 20:17:43 +00:00
Efi Fogel 68700cdf01 Added default arg. k used to trigger the switch from divide-and-conquer to sweep-line algorithm 2010-03-02 14:14:56 +00:00
Efi Fogel bd6cbe7b43 cleanup 2010-03-02 14:13:11 +00:00
Efi Fogel a6e2b1b994 added oriented_side() free-function template 2010-03-02 14:12:13 +00:00
Efi Fogel 8da2d83f2d removed executable flag 2010-03-01 15:58:25 +00:00
Efi Fogel 6e72830c43 Added oriented_side() testing 2010-03-01 15:57:30 +00:00
Efi Fogel 963381cbe7 Added oriented_side() 2010-03-01 15:57:02 +00:00
Efi Fogel f8b36b92b8 added bbox() 2010-03-01 15:43:04 +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
Sylvain Pion 85dc12f2a7 Remove empty lines at beginning and end of files
(apply Scripts/developer_scripts/remove_empty_lines.pl).
2010-02-01 12:55:28 +00:00
Fernando Cacciola b4f28b72b0 Misc fixes 2010-01-29 17:44:46 +00:00
Laurent Rineau bb7acdc28c Merged revisions 53882,53891-53892,53900,53902-53905 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53882 | penarand | 2010-01-28 18:31:05 +0100 (Thu, 28 Jan 2010) | 5 lines
  
  corrected typo in preprocessing directive ( and -> && ), avoided some vc
  warnings by making some casts explicit and eliminated a spurious #include
  that made the compilation fail in some configurations without gmpxx
........
  r53891 | lrineau | 2010-01-29 10:03:49 +0100 (Fri, 29 Jan 2010) | 10 lines
  
  Merge from trunk:
    | ------------------------------------------------------------------------
    | r53889 | stayeb | 2010-01-29 09:47:00 +0100 (Fri, 29 Jan 2010) | 1 line
    | Changed paths:
    |    M /trunk/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
    | 
    | Fix: replace Vector_3() by CGAL::NULL_VECTOR.
    | ------------------------------------------------------------------------
........
  r53892 | lrineau | 2010-01-29 10:23:09 +0100 (Fri, 29 Jan 2010) | 3 lines
  
  We do not want PDB demos or examples: officially that library is only
  an internal tool.
........
  r53900 | lrineau | 2010-01-29 12:23:44 +0100 (Fri, 29 Jan 2010) | 2 lines
  
  Remove the GraphicsView demo of Bool_op_2 from the release.
........
  r53902 | lrineau | 2010-01-29 14:52:13 +0100 (Fri, 29 Jan 2010) | 3 lines
  
  Add a paragraph about the "determinitication" of 2D/3D triangulations,
  segment Voronoi, and Apollonius Graph.
........
  r53903 | lrineau | 2010-01-29 15:03:15 +0100 (Fri, 29 Jan 2010) | 2 lines
  
  typos
........
  r53904 | lrineau | 2010-01-29 15:23:34 +0100 (Fri, 29 Jan 2010) | 15 lines
  
  Merge from trunk:
    | ------------------------------------------------------------------------
    | r53887 | afabri | 2010-01-29 09:22:03 +0100 (Fri, 29 Jan 2010) | 1 line
    | Changed paths:
    |    M /trunk/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_2/Segment_Delaunay_graph_hierarchy_2_impl.h
    | 
    | Default constructed boost::rand48 is good enough
    | ------------------------------------------------------------------------
    | r53888 | afabri | 2010-01-29 09:24:22 +0100 (Fri, 29 Jan 2010) | 1 line
    | Changed paths:
    |    M /trunk/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Apollonius_graph_hierarchy_2_impl.h
    | 
    | Default constructed boost::rand48 is good enough
    | ------------------------------------------------------------------------
........
  r53905 | lrineau | 2010-01-29 15:27:21 +0100 (Fri, 29 Jan 2010) | 38 lines
  
  Merge from trunk:
    | ------------------------------------------------------------------------
    | r53896 | lrineau | 2010-01-29 12:06:00 +0100 (Fri, 29 Jan 2010) | 2 lines
    | Changed paths:
    |    M /trunk/Polyhedron/demo/Polyhedron/MainWindow.ui
    |    M /trunk/Polyhedron/demo/Polyhedron/Nef_type.h
    |    M /trunk/Polyhedron/demo/Polyhedron/Nef_type_fwd.h
    |    M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_nef_plugin.cpp
    |    M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_triangulate_facets_plugin.cpp
    |    M /trunk/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp
    |    M /trunk/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.h
    | 
    | Add 3D Minkowski sum to the (Nef) Polyhedron demo.
    | 
    | ------------------------------------------------------------------------
    | r53897 | lrineau | 2010-01-29 12:10:38 +0100 (Fri, 29 Jan 2010) | 2 lines
    | Changed paths:
    |    M /trunk/Polyhedron/demo/Polyhedron/Polyhedron_demo_nef_plugin.cpp
    | 
    | Add a missing break;
    | 
    | ------------------------------------------------------------------------
    | r53898 | lrineau | 2010-01-29 12:12:27 +0100 (Fri, 29 Jan 2010) | 2 lines
    | Changed paths:
    |    D /trunk/Minkowski_sum_3/demo
    | 
    | Remove demo/ from Minkowski_sum_3, as the polyhedron demo has the feature.
    | 
    | ------------------------------------------------------------------------
    | r53899 | lrineau | 2010-01-29 12:15:43 +0100 (Fri, 29 Jan 2010) | 2 lines
    | Changed paths:
    |    D /trunk/Nef_3/demo/Nef_3/makefile
    | 
    | Remove that old makefile
    | 
    | ------------------------------------------------------------------------
........
2010-01-29 14:35:38 +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
Laurent Rineau 5e4c755bdb Merged revisions 53668-53669,53678-53679,53682-53686 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r53668 | yvinec | 2010-01-19 11:00:41 +0100 (Tue, 19 Jan 2010) | 3 lines
  
  added changes for Mesh_3
........
  r53669 | yvinec | 2010-01-19 11:04:38 +0100 (Tue, 19 Jan 2010) | 3 lines
  
  fixed page layout in Changes for Mesh_3
........
  r53678 | spion | 2010-01-20 13:32:36 +0100 (Wed, 20 Jan 2010) | 2 lines
  
  Link AK_d and reorder to have Modular close to NT.
........
  r53679 | lrineau | 2010-01-20 13:37:23 +0100 (Wed, 20 Jan 2010) | 9 lines
  
  Merge from trunk:
    | New Revision: 53666
    |  Author: sloriot
    |  Date: 2010-01-19 08:41:16 +0100 (Tue, 19 Jan 2010)
    |  
    |  Log message:
    |  
    | remove warnings
........
  r53682 | lrineau | 2010-01-20 14:31:41 +0100 (Wed, 20 Jan 2010) | 2 lines
  
  Simplify the URL to CORE, so that "_" is not in the URL (Pb with manual tools)
........
  r53683 | lrineau | 2010-01-20 14:42:23 +0100 (Wed, 20 Jan 2010) | 3 lines
  
  Fix the package description of AK (fix the bib label and the version of
  CGAL)
........
  r53684 | lrineau | 2010-01-20 14:45:53 +0100 (Wed, 20 Jan 2010) | 1 line
  
  clean PkgDescription.tex
........
  r53685 | lrineau | 2010-01-20 15:01:09 +0100 (Wed, 20 Jan 2010) | 3 lines
  
  - Update PkgDexcription.tex to year 2010.
  - Add manual-3.6.bib
........
  r53686 | lrineau | 2010-01-20 15:03:10 +0100 (Wed, 20 Jan 2010) | 1 line
  
  Update the biblio shipped in manual tools, using manual-3.6.bib
........
2010-01-20 14:07:18 +00:00