Commit Graph

12 Commits

Author SHA1 Message Date
Laurent Rineau 0681ac6dbc Fix the TBB_USE_FILE warnings 2017-11-15 17:00:02 +01:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Laurent Rineau 9debd6a471 Merge branch 'CGAL-various_fixes-lrineau'
s/const static/static const/

Tested in CGAL-4.6-Ic-79. Approved by the Release Manager.
2014-12-17 17:07:57 +01:00
Clement Jamin ee931b676e Copy constructors were missing (required by TBB) 2014-06-05 12:01:16 +02:00
Clement Jamin 24f7e767fa Replaced C++11 lambda function by functor 2014-06-05 10:59:48 +02:00
Clement Jamin b5a4a4d88d Add a CMake file with TBB 2014-06-05 10:59:17 +02:00
Laurent Rineau 06dac30143 Fix 'const static <type>'
The storage specified (static) is not allowed inside the type
specifier. It must be prefix or postfix (but not infix).

That is strange no C++ compiler gives an error on such a construction.

s/const static/static const/
2014-02-20 19:14:26 +01:00
Clement Jamin 596c84ccb7 Benchmark 2013-12-20 15:05:04 +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
Philipp Möller 171ad62f8c Changed benchmarks to properly function without C++0x. 2011-06-06 15:20:10 +00:00
Philipp Möller 75e1ec4dc0 Added a benchmark for an actual use case. Adapted CMake to generate both benchmarks. 2011-06-06 09:52:34 +00:00
Philipp Möller f2f32f007f Added a benchmark for copy_n 2011-06-01 14:05:51 +00:00