Commit Graph

32 Commits

Author SHA1 Message Date
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 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Laurent Rineau ca6840fcda Fix handling of CGAL_USE_GEOMVIEW by some demos and a test
Do not even include CGAL headers, especially the headers about
Geomview_stream support, if CGAL_USE_GEOMVIEW is not defined.

Has Geomview_stream has not been given a full CGAL_EXPORT support on
Windows, the single inclusion of <CGAL/Geomview_stream.h> may trigger
warning (or errors, I do not remember: see test result of
CGAL-3.10-Ic-163).
2011-10-19 13:16:44 +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
Sylvain Pion 34db2978c4 Remove unused makefiles. 2009-08-20 14:08:25 +00:00
Andreas Fabri 74bf87b137 one less warning for VC++ 2008-11-25 10:43:44 +00:00
Laurent Rineau 4032eade9a Massive removale of "QUIET" in find_package calls (except for
FindVTK.cmake, which has a bug). Let's see if that can help us to find out
why we still have problems with demos on MacOS and Windows.
2008-11-19 13:58:43 +00:00
Andreas Fabri 14de565860 Removed makefile 2008-11-11 15:52:02 +00:00
Andreas Fabri e1d3b3db3b Comment call to leda::print_statistics function which is missing in the free edition 2008-11-11 15:51:17 +00:00
Andreas Fabri de4f2d8445 As the demos don't need Qt the default generated file doesn't do the job 2008-11-11 15:39:41 +00:00
Fernando Cacciola f93437ca22 Removed *unmodified* auto-generated CMakeLists.txt (now created by create_internal_release) 2008-05-05 14:01:55 +00:00
Laurent Rineau 51f01ad033 Fix "Error: The function "atoi" must have a prototype."
(detected by Sun CC-5.9)
2008-03-11 11:23:57 +00:00
Fernando Cacciola b704509dcf Examples/Demos/Test CMake scripts updated 2008-03-05 21:14:02 +00:00
Fernando Cacciola a659cd852a Added project() and conditional test for CGAL_DIR 2008-02-14 15:42:36 +00:00
Fernando Cacciola 14043c43a0 Replaced CGALROOT by CGAL_DIR (the latters is used by CMake automatically) 2008-02-08 17:47:21 +00:00
Fernando Cacciola afddfc4fca CMake scripts for demos/examples/test added 2008-02-06 19:06:24 +00:00
Sylvain Pion 4d1b8d63e3 Remove workarounds and support for the BORLAND compiler. 2008-01-20 20:24:20 +00:00
Andreas Fabri 975b886328 .C -> .cpp 2007-06-28 18:36:15 +00:00
Andreas Fabri e98af359f4 removed and modified demos which depend on Leda 2007-03-13 13:47:55 +00:00
Joachim Reichel 704933f79a replace obsolete variable CGAL_WINDOW_LDFLAGS by CGAL_LDFLAGS 2007-03-11 09:57:31 +00:00
Sylvain Pion b2630cd7e1 Apply trailing whites-spaces and leadgin+trailing empty-lines cleanups
to demo/**/*.h and .cpp.
2007-03-10 16:55:12 +00:00
Andreas Meyer 68c3715b5c support for LEDA 5.x (mostly done by Eric Berberich) 2006-08-10 15:14:32 +00:00
Andreas Fabri c29334c0cb changed .C to .cpp in examples 2006-07-09 21:20:20 +00:00
Fernando Cacciola f325446f66 Missing #include <CGAL/basic.h> added 2006-03-29 14:31:13 +00:00
Joachim Reichel f582718758 rename create_makefile to cgal_create_makefile to avoid name clashes,
adjust all occurences of create_makefile and create\_makefile in the entire
repository (well, trunk only)
2006-03-15 22:10:02 +00:00
Marc Glisse b41ad5d643 Missing std:: or #include <cstdlib> 2006-02-25 23:14:49 +00:00
Laurent Saboret db6a8f948c Change CVS keywords to SVN style 2006-02-16 14:30:13 +00:00
Laurent Saboret 1aad55d4cb Change CVS keywords to SVN style 2006-02-14 10:08:15 +00:00
Laurent Saboret 75227528ee Move packages to trunk root 2006-02-14 08:58:14 +00:00