Commit Graph

130 Commits

Author SHA1 Message Date
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Laurent Rineau 7bcad36d7e
Merge branch 'master' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-05-14 16:03:28 +02:00
Laurent Rineau 870ff45168 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:48:03 +02:00
Laurent Rineau aebb058b58 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:45:00 +02:00
Laurent Rineau b7631f19b5 Fix Ridges_3 and SM_shortest_path with Boost 1.70 2019-05-06 10:11:18 +02:00
Simon Giraudot d8b51a9672 Merge remote-tracking branch 'laurent/Installation-remove_FindBLAS_LAPACK_TAUCS-GF' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-04-09 15:22:45 +02:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Simon Giraudot 911bea4021 Remove Lapack support from Jet_fitting, PSP, Ridges and Solver_interface 2019-03-08 09:53:21 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Andreas Fabri 991f3847e8 Do not include graph_traits_Polyhedron.h, properties_polyhedron.h and Polyhedron_iostream.h 2018-05-03 13:23:50 +02:00
Guillaume Damiand c8250c4570 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-15 10:03:53 -04:00
Guillaume Damiand f5a94891bb Update examples and demo that use BGL for LCC. 2017-06-14 11:42:15 -04:00
Guillaume Damiand 885ef4775a Update examples and tests following renaming of BGL LCC helpers. 2017-05-10 16:20:11 -04:00
Andreas Fabri c81b707bfb Do not include graph_traits_{Polyhedron | Surface_mesh}.h 2017-04-24 19:17:43 +02:00
Guillaume Damiand 755272148a Cleanup BGL for LCC; add shortcut for item with id to simplify definition. 2017-03-31 17:11:36 -04:00
Guillaume Damiand 15ac1f6b35 Add two more examples for BGL for LCC 2017-03-29 13:53:22 -04:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Andreas Fabri 66a57a1b04 ## -> # 2016-01-27 08:58:17 +01:00
Andreas Fabri 2cff1012de only use it if it is available 2016-01-26 17:42:35 +01:00
Andreas Fabri 4b8944e5b2 Replace #ifdef CGAL_USE_BOOST_PROGRAM_OPTIONS with #ifndef DONT_USE_BOOST_PROGRAM_OPTIONS 2016-01-26 17:16:02 +01:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Andreas Fabri ef0b83fd86 remove unused parameter name 2015-04-15 11:56:44 +02:00
Andreas Fabri 38f77fa583 cleanup 2015-03-17 11:53:22 +01:00
Sébastien Loriot 6d13bb7080 fix compilation issues 2015-03-17 11:24:52 +01:00
Andreas Fabri a3cf33927a do NOT use 'using std' as it introduces ambiguities for function next 2015-03-17 10:41:26 +01:00
Andreas Fabri 90addf9c34 improve examples 2015-03-13 12:14:11 +01:00
Andreas Fabri 91902b9dda improve manual 2015-03-13 09:01:50 +01:00
Andreas Fabri 05669c9800 not 'using std' does not solve the problem with next 2015-03-13 06:05:36 +01:00
Andreas Fabri df6fc3dca3 simplifications 2015-03-12 18:00:18 +01:00
Andreas Fabri 767e0efad3 cleanup 2015-03-12 11:01:56 +01:00
Andreas Fabri 9483280b5b Add example using Surface_mesh 2015-03-11 22:58:55 +01:00
Andreas Fabri fb7deef4ab it now works with Surface_mesh 2015-03-11 19:21:30 +01:00
Andreas Fabri 2d7f51f441 it now works with Surface_mesh 2015-03-11 19:05:57 +01:00
Andreas Fabri 0321056aff before switching to Surface_mesh 2015-03-11 16:48:46 +01:00
Andreas Fabri c1bc5b05ad use BGL free functions 2015-03-11 12:13:46 +01:00
Andreas Fabri 81f5481cfd remove file with functor 2015-03-11 11:53:16 +01:00
Andreas Fabri 298be9cf07 remove file with functor 2015-03-11 11:53:09 +01:00
Andreas Fabri 837a0747a4 use BGL free functions 2015-03-11 11:52:24 +01:00
Andreas Fabri 4b18039316 use graph_traits 2015-03-11 08:30:13 +01:00
Andreas Fabri 171e86a656 User code has to delete ridges and umbilics; internally use a shared_ptr 2013-11-11 17:19:24 +01:00
Andreas Fabri 8ad719e269 Passed to Simple_cartesian
Cleanup of inclusion order, and what files gets included
2013-08-27 10:20:13 +02:00
Laurent Rineau 6fb798bae3 Remove committed .sln and .vcproj files!
And clean the .gitignore file: the .vcproj and .sln are already in the
global globing, and for that reason I have removed all occurrences in
subdirectories.
2013-01-11 09:39:08 +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