Commit Graph

200 Commits

Author SHA1 Message Date
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 4edaa583e4 merge from trunk 2011-04-27 20:54:11 +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
Sébastien Loriot 6e897fafb6 bug-fix: typo 2011-04-26 17:01:34 +00:00
Laurent Rineau da95064578 Update the \ccPkgHowToCiteCgal tag for CGAL-3.8 (2011). 2011-02-24 15:21:10 +00:00
Sébastien Loriot a2cec87f46 replace remaing fabs in include files by CGAL::abs 2011-02-18 15:37:40 +00:00
Andreas Fabri 4070f44d62 Use CGAL::abs instead of fabs 2011-02-16 16:37:23 +00:00
Andreas Fabri 2fee1527c2 Use size_type instead of int 2011-01-11 14:59:50 +00:00
Manuel Caroli f1059c785c remove deprecated functions as was done for the non-periodic case
to avoid warning with clang
2010-11-17 13:30:08 +00:00
Manuel Caroli 1876c25281 define functions before using them in order to avoid error with clang 2010-11-17 13:29:22 +00:00
Manuel Caroli 27f838fb7e remove unused variables 2010-11-12 17:03:19 +00:00
Andreas Fabri c2ca884e0a Remove unused variable 2010-11-12 08:39:33 +00:00
Laurent Rineau 3e7b862d7d Follow-up to my previous commit: Periodic_3_triangulation_filtered_traits_3
needs a default value for its second template argument "Off".
2010-09-15 21:08:15 +00:00
Laurent Rineau a448af53f7 Revert the following revision, which was the wrong way to "fix" the issue:
| ------------------------------------------------------------------------
  | r58079 | mcaroli | 2010-08-15 20:28:30 +0200 (Sun, 15 Aug 2010) | 2 lines
  | Changed paths:
  |    M /trunk/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h
  | 
  | minor fix
  | 
  | ------------------------------------------------------------------------

The issue is that Periodic_3_triangulation_traits_3<K> needs to be
specialized for Filtered_kernel, but
CGAL::Exact_predicates_inexact_constructions_kernel is no longer a typedef
for Filtered_kernel<Simple_cartesian<double> >:  it is now a class
CGAL::Epick, equivalent to Filtered_kernel<...>.

The solution is to partially specialize
Periodic_3_triangulation_traits_3<K> for CGAL::Epick too. But, for that, I
needed to make Periodic_3_triangulation_filtered_traits_base_3 have a
second template parameter Offset, like Periodic_3_triangulation_traits_3<K>
(Offset has a default value), to avoid an instantiation loop.

The revision 58079 above was just a patch that showed that
Periodic_3_triangulation_filtered_traits_base_3 was no longer used with the
EPIC kernel.
2010-09-15 16:36:27 +00:00
Laurent Rineau 7606b93406 Merge last unmerged revision from the branch CGAL-3.7-branch:
| ------------------------------------------------------------------------
  | r57979 | lrineau | 2010-08-11 15:24:20 +0200 (Wed, 11 Aug 2010) | 1 line
  | 
  | Global fix of all uses of qt4_generate_moc: the destination file path must be absolute.
  | ------------------------------------------------------------------------
  | r58026 | stayeb | 2010-08-12 17:40:41 +0200 (Thu, 12 Aug 2010) | 2 lines
  | 
  | Bug fix: ensure that c3t3 contains no in complex cell when starting a new refinement process. We need this because the first refinement of the surface does not update the volume, so c3t3 can't know that in complex cells have been deleted.
  | 
  | ------------------------------------------------------------------------

(That shows it is difficult to avoid to merge the release branch in the
trunk from time to time.)
2010-08-20 13:09:22 +00:00
Laurent Rineau 30f1115639 Backport from trunk:
| ------------------------------------------------------------------------
  | r58060 | lrineau | 2010-08-13 18:07:57 +0200 (Fri, 13 Aug 2010) | 2 lines
  | Changed paths:
  |    M /trunk/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_filtered_traits_3.h
  |    M /trunk/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_statically_filtered_traits_3.h
  | 
  | Fix compilation with -DCGAL_CFG_MATCHING_BUG_6
  | 
  | ------------------------------------------------------------------------
2010-08-19 11:58:49 +00:00
Manuel Caroli cafa29bd6e minor fix 2010-08-15 18:28:30 +00:00
Laurent Rineau 210578c95a Fix compilation with -DCGAL_CFG_MATCHING_BUG_6 2010-08-13 16:07:57 +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 b0c3cf4121 Merge the work from CGAL-3.7-branch:
| ------------------------------------------------------------------------
  | r57723 | lrineau | 2010-08-02 16:51:09 +0200 (Mon, 02 Aug 2010) | 9 lines
  | 
  | - 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-10 11:56:34 +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
Manuel Caroli 3bb22cc580 make the help work using a non-interactive QProcess that calls the assistant 2010-07-11 19:18:34 +00:00
Manuel Caroli 52227057f8 added the paths to the icons in the collection file 2010-07-05 16:21:17 +00:00
Manuel Caroli 0715fb8896 small bugfixes. Help works now under Linux.
TODO: the qhc must be registered in the assistant.
Can this be done using cmake?
The help does not show the icons, which works under MacOS though.
2010-07-05 16:16:56 +00:00
Manuel Caroli 3cf9ee4c67 Use QProcess instead of deprecated QAssistentClient to show custom help
Does not yet work: the QtAssistent gets stuck in the background
2010-07-05 15:16:07 +00:00
Andreas Fabri ec14ce674f int size_t 2010-06-24 16:25:36 +00:00
Andreas Fabri b1c1823f51 int size_t 2010-06-24 16:25:04 +00:00
Andreas Fabri f30692b048 int size_t 2010-06-24 16:24:54 +00:00
Manuel Caroli d732146e00 improved the small figure 2010-06-22 18:08:34 +00:00
Manuel Caroli 5a8b4b31ba made the figure 75% smaller and take a part of it for the small version 2010-06-22 18:06:25 +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
Manuel Caroli 935f8d788c scale small package illustration picture to 120x120 px 2010-06-07 14:07:08 +00:00
Manuel Caroli ba3615d537 make small version of the package illustration squared
in order to avoid stretching
2010-06-07 14:05:15 +00:00
Manuel Caroli a34a47f08c new illustration for the P3T3 package 2010-06-05 12:37:47 +00:00
Laurent Rineau 67928706cf C++ conformance: calls to member templates of dependent names must be
qualified with the "template" keyword.

Example:
  template <typenam T>
  void f(T foobar) {
    foobar.get<0>().foobar(); // error
  }
must be written:

  foobar.template get<0>().foobar();
2010-05-16 16:50:24 +00:00
Manuel Caroli 258d98bfaf establish strict-ansi compliance 2010-05-13 15:33:16 +00:00
Sébastien Loriot e3c0dd54fb change private to protected (needed by 'using locate' in Alpha_shape_3 class) 2010-05-13 06:39:52 +00:00
Manuel Caroli 2154129b9c use NT_converter to test whether the given domain is a cube (precondition) 2010-05-10 21:42:48 +00:00
Manuel Caroli 972756d810 construct underlying triangulation without dummy points 2010-05-07 08:40:50 +00:00
Manuel Caroli bf5e38abb8 fix errors in strict-ansi mode 2010-05-07 08:38:36 +00:00
Manuel Caroli adf3589c64 fix warning 2010-05-06 21:33:19 +00:00
Manuel Caroli 1fa16139a0 split the traits test into several tests to decrease the number of instantiations for VC++ 2010-05-06 16:55:09 +00:00
Manuel Caroli 83e7ca6895 deactivate assertion that is not evaluated exactly 2010-05-06 16:52:46 +00:00
Manuel Caroli b6f9f38dab check whether the new assertion works with CentOS 2010-05-04 20:03:24 +00:00