Commit Graph

9 Commits

Author SHA1 Message Date
Laurent Rineau 3f9df99964 Partially revert the commit 455190a2e4
The commit 455190a2e4 contains debugging code
that should have never being commited (and does not compile if
CGAL_USE_ZLIB is not defined).
2013-03-18 15:40:29 +01:00
Andreas Fabri 455190a2e4 removed one parameter too much 2013-03-01 08:55:10 +01:00
Laurent Rineau 26a7e70785 New license.txt files (eol changes)
The new version 2.13.0 of licensecheck has changed the spaces at eol.
2013-02-19 16:46:39 +01:00
Eric Berberich 4dc69cd3c0 this demo needs ImageIO
Now only raise a "r" instead of a compile error in testsuite if CGAL_ImageIO=OFF
2012-10-10 12:06:11 +00:00
Laurent Rineau 7fbe8d6bef That package has been renamed, but but its package_info. 2012-10-09 09:24:27 +00: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
Eric Berberich 1d686a07b5 new packagename 2012-08-05 11:22:11 +00:00
Eric Berberich 0608eba0f1 correct library names 2012-08-03 18:09:57 +00:00
Eric Berberich 326179f482 packagename reflects library name (CGAL_ImageIO is shipped with CGAL) 2012-08-03 17:31:39 +00:00