From 3ec0c69f8f63d0e5e1464a8c527b92fd0d7434a8 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 9 Jul 2015 17:45:56 +0200 Subject: [PATCH] We want 2.8.10 for all demos Previous versions are not tested by the CGAL daily test suite. --- AABB_tree/demo/AABB_tree/CMakeLists.txt | 2 +- .../demo/Alpha_shapes_3/CMakeLists.txt | 2 +- .../Arrangement_on_surface_2/CMakeLists.txt | 2 +- .../old_demo/CMakeLists.txt | 2 +- .../Boolean_set_operations_2/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../demo/Min_circle_2/CMakeLists.txt | 2 +- .../demo/Min_ellipse_2/CMakeLists.txt | 2 +- .../Min_quadrilateral_2/CMakeLists.txt | 2 +- CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt | 2 +- CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt | 2 +- CMakeLists.txt | 2 +- .../demo/Circular_kernel_3/CMakeLists.txt | 2 +- .../demo/Convex_decomposition_3/CMakeLists.txt | 2 +- Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt | 2 +- Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt | 2 +- Envelope_3/demo/Envelope_3/CMakeLists.txt | 2 +- Geomview/demo/Geomview/CMakeLists.txt | 2 +- GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt | 2 +- .../demo/Apollonius_graph_2/CMakeLists.txt | 2 +- .../demo/Bounding_volumes/CMakeLists.txt | 2 +- .../demo/Circular_kernel_2/CMakeLists.txt | 2 +- GraphicsView/demo/Generator/CMakeLists.txt | 2 +- GraphicsView/demo/GraphicsView/CMakeLists.txt | 2 +- .../demo/L1_Voronoi_diagram_2/CMakeLists.txt | 2 +- .../demo/Largest_empty_rect_2/CMakeLists.txt | 2 +- .../Periodic_2_triangulation_2/CMakeLists.txt | 2 +- GraphicsView/demo/Polygon/CMakeLists.txt | 2 +- .../Segment_Delaunay_graph_2/CMakeLists.txt | 2 +- .../demo/Snap_rounding_2/CMakeLists.txt | 2 +- .../demo/Spatial_searching_2/CMakeLists.txt | 2 +- GraphicsView/demo/Stream_lines_2/CMakeLists.txt | 2 +- .../demo/Triangulation_2/CMakeLists.txt | 2 +- Installation/CMakeLists.txt | 2 +- Installation/demo/CMakeLists.txt | 2 +- Interpolation/demo/Interpolation/CMakeLists.txt | 2 +- .../demo/Kinetic_data_structures/CMakeLists.txt | 2 +- .../Linear_cell_complex_3/CMakeLists.txt | 5 ++++- .../demo/Linear_cell_complex/CMakeLists.txt | 2 +- Matrix_search/demo/Matrix_search/CMakeLists.txt | 2 +- Mesh_2/demo/Mesh_2/CMakeLists.txt | 2 +- Mesh_2/demo/Mesh_2/Qt3/CMakeLists.txt | 2 +- Mesh_3/demo/Mesh_3/CMakeLists.txt | 2 +- .../Mesh_3/implicit_functions/CMakeLists.txt | 2 +- Nef_2/demo/Nef_2/CMakeLists.txt | 2 +- Nef_3/demo/Nef_3/CMakeLists.txt | 2 +- Nef_S2/demo/Nef_S2/CMakeLists.txt | 2 +- .../Periodic_3_triangulation_3/CMakeLists.txt | 2 +- .../demo/Periodic_Lloyd_3/CMakeLists.txt | 2 +- Polyhedron/demo/Polyhedron/CMakeLists.txt | 2 +- .../implicit_functions/CMakeLists.txt | 2 +- Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt | 2 +- .../Polyline_simplification_2/CMakeLists.txt | 2 +- .../Principal_component_analysis/CMakeLists.txt | 2 +- .../Scale_space_reconstruction_3/CMakeLists.txt | 2 +- Scripts/scripts/cgal_create_CMakeLists | 17 +---------------- Scripts/scripts/cgal_create_cmake_script | 9 +-------- .../demo/Straight_skeleton_2/CMakeLists.txt | 2 +- .../demo/Surface_mesher/CMakeLists.txt | 2 +- .../demo/Surface_modeling/CMakeLists.txt | 2 +- .../demo/Triangulation_3/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../demo/Voronoi_diagram_2/CMakeLists.txt | 2 +- 63 files changed, 66 insertions(+), 85 deletions(-) diff --git a/AABB_tree/demo/AABB_tree/CMakeLists.txt b/AABB_tree/demo/AABB_tree/CMakeLists.txt index cec72a6421c..95cf17d72b0 100644 --- a/AABB_tree/demo/AABB_tree/CMakeLists.txt +++ b/AABB_tree/demo/AABB_tree/CMakeLists.txt @@ -6,7 +6,7 @@ project( AABB_demo ) set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed. set(CMAKE_AUTOMOC ON) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt b/Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt index 36173ed36b4..19d7cc51ca6 100644 --- a/Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt +++ b/Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt @@ -6,7 +6,7 @@ project (Alpha_shape_3) set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed. set(CMAKE_AUTOMOC ON) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt index e0bdb28e7b3..d7c936c0346 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( Arrangement_2 ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/old_demo/CMakeLists.txt b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/old_demo/CMakeLists.txt index 294bca8def7..4d8d30ed3d2 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/old_demo/CMakeLists.txt +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/old_demo/CMakeLists.txt @@ -2,7 +2,7 @@ project( Arrangement_2 ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2/CMakeLists.txt b/Boolean_set_operations_2/demo/Boolean_set_operations_2/CMakeLists.txt index 02f936ad331..960a7de91d5 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2/CMakeLists.txt +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( Boolean_operations_2 ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt index b76eefa5469..6cbdb7267fa 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt @@ -3,7 +3,7 @@ project( Boolean_operations_2_demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Bounding_volumes/demo/Min_circle_2/CMakeLists.txt b/Bounding_volumes/demo/Min_circle_2/CMakeLists.txt index 82e13eb325c..da648320eb0 100644 --- a/Bounding_volumes/demo/Min_circle_2/CMakeLists.txt +++ b/Bounding_volumes/demo/Min_circle_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( Min_circle_2_Demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Bounding_volumes/demo/Min_ellipse_2/CMakeLists.txt b/Bounding_volumes/demo/Min_ellipse_2/CMakeLists.txt index cb8da5cbc31..e8396988c5f 100644 --- a/Bounding_volumes/demo/Min_ellipse_2/CMakeLists.txt +++ b/Bounding_volumes/demo/Min_ellipse_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( Min_ellipse_2_Demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Bounding_volumes/demo/Min_quadrilateral_2/Min_quadrilateral_2/CMakeLists.txt b/Bounding_volumes/demo/Min_quadrilateral_2/Min_quadrilateral_2/CMakeLists.txt index 45345004b0a..db1f49adb9c 100644 --- a/Bounding_volumes/demo/Min_quadrilateral_2/Min_quadrilateral_2/CMakeLists.txt +++ b/Bounding_volumes/demo/Min_quadrilateral_2/Min_quadrilateral_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( min_quadrilateral_2 ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt b/CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt index 3394adbf9a1..37063d8e631 100644 --- a/CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt +++ b/CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt @@ -1,6 +1,6 @@ project(image_to_vtk_viewer) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt index dc4b94508d2..567071c4cb7 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt +++ b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 22994ec982c..c5d9a6a96e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ message( "== CMake setup ==" ) project(CGAL CXX C) # Minimal version of CMake: -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) # option for branch build diff --git a/Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt b/Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt index 5cd80fabca5..b428235bb63 100644 --- a/Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt +++ b/Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt @@ -1,6 +1,6 @@ project (Circular_kernel_3) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt b/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt index d4244de750d..bf64514266b 100644 --- a/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt +++ b/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt @@ -2,7 +2,7 @@ project( Convex_decomposition_3 ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt b/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt index c69d4fa86e3..9faef52031d 100644 --- a/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt +++ b/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( convex_hull_2 ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt b/Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt index ca7554ef8ba..4754dc3c726 100644 --- a/Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt +++ b/Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt @@ -4,7 +4,7 @@ project( Convex_hull_3_Demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Envelope_3/demo/Envelope_3/CMakeLists.txt b/Envelope_3/demo/Envelope_3/CMakeLists.txt index 666f483719e..25d4b2859d5 100644 --- a/Envelope_3/demo/Envelope_3/CMakeLists.txt +++ b/Envelope_3/demo/Envelope_3/CMakeLists.txt @@ -4,7 +4,7 @@ project( Envelope_3_demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Geomview/demo/Geomview/CMakeLists.txt b/Geomview/demo/Geomview/CMakeLists.txt index 6ecbf001ccc..de3b025197a 100644 --- a/Geomview/demo/Geomview/CMakeLists.txt +++ b/Geomview/demo/Geomview/CMakeLists.txt @@ -4,7 +4,7 @@ project( Geomview_Demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt b/GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt index 493816e8e25..e70dcd91b44 100644 --- a/GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt +++ b/GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt @@ -3,7 +3,7 @@ project (Alpha_shapes_2_demo) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt b/GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt index 40e1b7aaa50..b57cd10535a 100644 --- a/GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt +++ b/GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt @@ -3,7 +3,7 @@ project (Apollonius_graph_2_demo) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Bounding_volumes/CMakeLists.txt b/GraphicsView/demo/Bounding_volumes/CMakeLists.txt index e814d5f1df5..59bd97cd21e 100644 --- a/GraphicsView/demo/Bounding_volumes/CMakeLists.txt +++ b/GraphicsView/demo/Bounding_volumes/CMakeLists.txt @@ -3,7 +3,7 @@ project (Bounding_volumes) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt b/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt index 658bb01c7f8..2bb6dfcec46 100644 --- a/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt +++ b/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt @@ -3,7 +3,7 @@ project (Circular_kernel_2) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Generator/CMakeLists.txt b/GraphicsView/demo/Generator/CMakeLists.txt index ea06203df7d..76f6d4345cc 100644 --- a/GraphicsView/demo/Generator/CMakeLists.txt +++ b/GraphicsView/demo/Generator/CMakeLists.txt @@ -3,7 +3,7 @@ project (GeneratorDemo) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/GraphicsView/CMakeLists.txt b/GraphicsView/demo/GraphicsView/CMakeLists.txt index 84e4dbbf4df..af6be88958f 100644 --- a/GraphicsView/demo/GraphicsView/CMakeLists.txt +++ b/GraphicsView/demo/GraphicsView/CMakeLists.txt @@ -2,7 +2,7 @@ project (GraphicsView) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt b/GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt index 1d321d45047..b9c7eb015bf 100644 --- a/GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt +++ b/GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt @@ -3,7 +3,7 @@ project (L1_voronoi_diagram_2) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt b/GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt index 371082b344e..dc96dc13c10 100644 --- a/GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt +++ b/GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt @@ -3,7 +3,7 @@ project (Largest_empty_rectangleDemo) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt b/GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt index 7d8ff03782c..9eb7e62c04e 100644 --- a/GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt +++ b/GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt @@ -1,6 +1,6 @@ project (Periodic_2_Triangulation_2_demo) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Polygon/CMakeLists.txt b/GraphicsView/demo/Polygon/CMakeLists.txt index 20fc3dc2fd0..44adae04edf 100644 --- a/GraphicsView/demo/Polygon/CMakeLists.txt +++ b/GraphicsView/demo/Polygon/CMakeLists.txt @@ -3,7 +3,7 @@ project (GraphicsView) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt b/GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt index 5aa864208d3..c9b9bb0ffc2 100644 --- a/GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt +++ b/GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt @@ -3,7 +3,7 @@ project (Segment_voronoi_2) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Snap_rounding_2/CMakeLists.txt b/GraphicsView/demo/Snap_rounding_2/CMakeLists.txt index ba03c2f1e0b..47087eb76c7 100644 --- a/GraphicsView/demo/Snap_rounding_2/CMakeLists.txt +++ b/GraphicsView/demo/Snap_rounding_2/CMakeLists.txt @@ -3,7 +3,7 @@ project (Snap_rounding_2_demo) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Spatial_searching_2/CMakeLists.txt b/GraphicsView/demo/Spatial_searching_2/CMakeLists.txt index e541182aa5e..1ddcbb50494 100644 --- a/GraphicsView/demo/Spatial_searching_2/CMakeLists.txt +++ b/GraphicsView/demo/Spatial_searching_2/CMakeLists.txt @@ -3,7 +3,7 @@ project (Spatial_searchingDemo) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Stream_lines_2/CMakeLists.txt b/GraphicsView/demo/Stream_lines_2/CMakeLists.txt index bf778783aa0..a9fbee1867e 100644 --- a/GraphicsView/demo/Stream_lines_2/CMakeLists.txt +++ b/GraphicsView/demo/Stream_lines_2/CMakeLists.txt @@ -3,7 +3,7 @@ project (Stream_lines_2_demo) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/GraphicsView/demo/Triangulation_2/CMakeLists.txt b/GraphicsView/demo/Triangulation_2/CMakeLists.txt index 30a921133ae..6dec792d375 100644 --- a/GraphicsView/demo/Triangulation_2/CMakeLists.txt +++ b/GraphicsView/demo/Triangulation_2/CMakeLists.txt @@ -3,7 +3,7 @@ project (Triangulation_2) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index f08d15c55ef..b9c4340d72b 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -6,7 +6,7 @@ project(CGAL CXX C) # Minimal version of CMake: -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) # Tested version: cmake_policy(VERSION 2.8.11) diff --git a/Installation/demo/CMakeLists.txt b/Installation/demo/CMakeLists.txt index 4f63a6f4b22..b8d037f2955 100644 --- a/Installation/demo/CMakeLists.txt +++ b/Installation/demo/CMakeLists.txt @@ -1,6 +1,6 @@ project(CGAL_DEMOS) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if (CGAL_BRANCH_BUILD) diff --git a/Interpolation/demo/Interpolation/CMakeLists.txt b/Interpolation/demo/Interpolation/CMakeLists.txt index a10b1d78f46..49b53955434 100644 --- a/Interpolation/demo/Interpolation/CMakeLists.txt +++ b/Interpolation/demo/Interpolation/CMakeLists.txt @@ -4,7 +4,7 @@ project( Interpolation_ ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt b/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt index 446f4ed3fbf..c493c33a90b 100644 --- a/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt +++ b/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt @@ -2,7 +2,7 @@ project( Kinetic_data_structures_demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_3/CMakeLists.txt b/Linear_cell_complex/benchmark/Linear_cell_complex_3/CMakeLists.txt index 82698c9694e..9e3deedc1af 100644 --- a/Linear_cell_complex/benchmark/Linear_cell_complex_3/CMakeLists.txt +++ b/Linear_cell_complex/benchmark/Linear_cell_complex_3/CMakeLists.txt @@ -1,6 +1,9 @@ project(LCC_performance_3) -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.10) +if(POLICY CMP0043) + cmake_policy(SET CMP0043 OLD) +endif() find_package(CGAL REQUIRED) include(${CGAL_USE_FILE}) diff --git a/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt b/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt index 99cf299301d..bd55d266510 100644 --- a/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt +++ b/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed. set(CMAKE_AUTOMOC ON) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Matrix_search/demo/Matrix_search/CMakeLists.txt b/Matrix_search/demo/Matrix_search/CMakeLists.txt index 25b766fe695..47b8d45401c 100644 --- a/Matrix_search/demo/Matrix_search/CMakeLists.txt +++ b/Matrix_search/demo/Matrix_search/CMakeLists.txt @@ -2,7 +2,7 @@ project( Matrix_search_Demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Mesh_2/demo/Mesh_2/CMakeLists.txt b/Mesh_2/demo/Mesh_2/CMakeLists.txt index 2b34c25097f..0637ac3fe15 100644 --- a/Mesh_2/demo/Mesh_2/CMakeLists.txt +++ b/Mesh_2/demo/Mesh_2/CMakeLists.txt @@ -3,7 +3,7 @@ project( mesh_2_demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Mesh_2/demo/Mesh_2/Qt3/CMakeLists.txt b/Mesh_2/demo/Mesh_2/Qt3/CMakeLists.txt index d00e8d57a56..22ab453bc86 100644 --- a/Mesh_2/demo/Mesh_2/Qt3/CMakeLists.txt +++ b/Mesh_2/demo/Mesh_2/Qt3/CMakeLists.txt @@ -4,7 +4,7 @@ project( mesh_2_qt3_demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Mesh_3/demo/Mesh_3/CMakeLists.txt b/Mesh_3/demo/Mesh_3/CMakeLists.txt index 90b452d45ee..0df28d845d6 100644 --- a/Mesh_3/demo/Mesh_3/CMakeLists.txt +++ b/Mesh_3/demo/Mesh_3/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Mesh_3/demo/Mesh_3/implicit_functions/CMakeLists.txt b/Mesh_3/demo/Mesh_3/implicit_functions/CMakeLists.txt index 2e1ab09d1eb..4ebad8eb6e8 100644 --- a/Mesh_3/demo/Mesh_3/implicit_functions/CMakeLists.txt +++ b/Mesh_3/demo/Mesh_3/implicit_functions/CMakeLists.txt @@ -2,7 +2,7 @@ project( Mesh_3_implicit_functions ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Nef_2/demo/Nef_2/CMakeLists.txt b/Nef_2/demo/Nef_2/CMakeLists.txt index 5582e3d8f97..c0e150d9d5f 100644 --- a/Nef_2/demo/Nef_2/CMakeLists.txt +++ b/Nef_2/demo/Nef_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( Nef_2 ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Nef_3/demo/Nef_3/CMakeLists.txt b/Nef_3/demo/Nef_3/CMakeLists.txt index 06312d95059..8db07ef5a2d 100644 --- a/Nef_3/demo/Nef_3/CMakeLists.txt +++ b/Nef_3/demo/Nef_3/CMakeLists.txt @@ -2,7 +2,7 @@ project (Nef_3_Demo) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Nef_S2/demo/Nef_S2/CMakeLists.txt b/Nef_S2/demo/Nef_S2/CMakeLists.txt index 99fd2a6b1cb..5485f88bc37 100644 --- a/Nef_S2/demo/Nef_S2/CMakeLists.txt +++ b/Nef_S2/demo/Nef_S2/CMakeLists.txt @@ -2,7 +2,7 @@ project( Nef_S2 ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt index bec91348456..27072ce4e02 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt +++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt @@ -4,7 +4,7 @@ project( Periodic_3_triangulation_3_demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt index 182362cc9c0..5416f99ffb0 100644 --- a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt +++ b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt @@ -7,7 +7,7 @@ project (Periodic_Lloyd_3) set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed. set(CMAKE_AUTOMOC ON) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt index 3149e05c748..327e24576a1 100644 --- a/Polyhedron/demo/Polyhedron/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt @@ -5,7 +5,7 @@ project( Polyhedron ) set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed. set(CMAKE_AUTOMOC ON) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt b/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt index 3152d9b9be9..a38270add7f 100644 --- a/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt @@ -2,7 +2,7 @@ project( Mesh_3_implicit_functions ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt b/Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt index 1e91cdc1144..76d1d71ba73 100644 --- a/Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt +++ b/Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt @@ -4,7 +4,7 @@ project( Polyhedron_IO_Demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt b/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt index c159d31b2ce..cadde879a0c 100644 --- a/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt +++ b/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt @@ -3,7 +3,7 @@ project (Polyline_simplification_2) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt index dc03be3282f..b91a82b82cb 100644 --- a/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt +++ b/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt @@ -2,7 +2,7 @@ project( PCA_demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt b/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt index 658bbd10609..1d79862721a 100644 --- a/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt +++ b/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt @@ -1,7 +1,7 @@ project( Scale_space ) # Check CMake version -cmake_minimum_required( VERSION 2.6.2 ) +cmake_minimum_required(VERSION 2.6.2) if( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6 ) if( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3 ) cmake_policy( VERSION 2.8.4 ) diff --git a/Scripts/scripts/cgal_create_CMakeLists b/Scripts/scripts/cgal_create_CMakeLists index 311bd5a553c..ba92eae818a 100755 --- a/Scripts/scripts/cgal_create_CMakeLists +++ b/Scripts/scripts/cgal_create_CMakeLists @@ -112,22 +112,7 @@ EOF cat << 'EOF' -cmake_minimum_required(VERSION 2.6.2) -if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6) - 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() -endif() - -set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true ) - -if ( COMMAND cmake_policy ) - - cmake_policy( SET CMP0003 NEW ) - -endif() +cmake_minimum_required(VERSION 2.8.10) # CGAL and its components EOF diff --git a/Scripts/scripts/cgal_create_cmake_script b/Scripts/scripts/cgal_create_cmake_script index 2a29e1ec9fb..b6afcacd3c5 100755 --- a/Scripts/scripts/cgal_create_cmake_script +++ b/Scripts/scripts/cgal_create_cmake_script @@ -44,14 +44,7 @@ project( ${PROJECT}_${TYPE} ) EOF cat <<'EOF' -cmake_minimum_required(VERSION 2.6.2) -if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6) - 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() -endif() +cmake_minimum_required(VERSION 2.8.10) EOF diff --git a/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt index 07882d57a15..16c9a047fee 100644 --- a/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt +++ b/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( straight_skeleton_2 ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Surface_mesher/demo/Surface_mesher/CMakeLists.txt b/Surface_mesher/demo/Surface_mesher/CMakeLists.txt index da54c48c9fa..bc2b91b8437 100644 --- a/Surface_mesher/demo/Surface_mesher/CMakeLists.txt +++ b/Surface_mesher/demo/Surface_mesher/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed. set(CMAKE_AUTOMOC ON) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Surface_modeling/demo/Surface_modeling/CMakeLists.txt b/Surface_modeling/demo/Surface_modeling/CMakeLists.txt index 8ba25e2e5c4..6b7716bcc7d 100644 --- a/Surface_modeling/demo/Surface_modeling/CMakeLists.txt +++ b/Surface_modeling/demo/Surface_modeling/CMakeLists.txt @@ -4,7 +4,7 @@ project( Surface_modeling_demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt index 425bb97fd15..ca1c77ba4e7 100644 --- a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt +++ b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed. set(CMAKE_AUTOMOC ON) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Triangulation_3/demo/Triangulation_3_Geomview_demos/CMakeLists.txt b/Triangulation_3/demo/Triangulation_3_Geomview_demos/CMakeLists.txt index 82989fc82de..42f495b5dc6 100644 --- a/Triangulation_3/demo/Triangulation_3_Geomview_demos/CMakeLists.txt +++ b/Triangulation_3/demo/Triangulation_3_Geomview_demos/CMakeLists.txt @@ -4,7 +4,7 @@ project( Triangulation_3_Demo ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif() diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt b/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt index 52df2086fd2..8056e8841b4 100644 --- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt +++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( voronoi_diagram_2 ) -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.10) if(POLICY CMP0043) cmake_policy(SET CMP0043 OLD) endif()