Commit Graph

25 Commits

Author SHA1 Message Date
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
Andreas Fabri dfea9e77dc Add a 'f' after a number 2013-02-09 16:24:57 +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 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 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 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
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 4bd9d6549f final minor cosmetics before the code freeze 2009-12-17 18:31:13 +00:00
Manuel Caroli 666b6e9c6c enable antialiasing for the viewer 2009-12-09 10:51:00 +00:00
Manuel Caroli dbadc61397 final changes to put the demo on the next release 2009-12-08 21:02:25 +00:00
Manuel Caroli 848c774faf correcting typo
several cosmetic changes
2009-12-08 19:55:53 +00:00
Manuel Caroli 83ab1400bb add functions to load and save point sets 2009-12-08 19:31:55 +00:00
Manuel Caroli 9c7b3580a0 bugfix in lloyd_step (centroid computation) 2009-12-08 18:16:06 +00:00
Manuel Caroli b550ee68f2 remove unused variables to avoid warnings 2009-11-11 16:14:09 +00:00
Manuel Caroli 88fe42756b fix warning 2009-10-28 15:09:02 +00:00
Manuel Caroli 84cd6ec9d1 improvements in CMakeLists.txt 2009-10-27 09:33:19 +00:00
Manuel Caroli 996f8b2954 keep one point at constant position to avoid the point set to move as a whole 2009-10-07 14:43:51 +00:00
Manuel Caroli 56e35c3ed1 integrating the icons in the executable 2009-10-07 11:59:24 +00:00
Manuel Caroli d26f570f3c Periodic Lloyd demo initial commit 2009-10-07 09:39:46 +00:00