From 4b795c56f40650526dff5d26940c543881f7eb2d Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 28 Apr 2011 10:33:17 +0000 Subject: [PATCH 1/3] Global handling of CMake policies 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. --- CGALimageIO/src/CGALImageIO/CMakeLists.txt | 6 ++++- GraphicsView/src/CGALQt4/CMakeLists.txt | 8 ++++-- Installation/CMakeLists.txt | 12 +++------ Installation/cmake/modules/CGAL_Common.cmake | 28 -------------------- Qt_widget/src/CGALQt3/CMakeLists.txt | 6 ++++- 5 files changed, 20 insertions(+), 40 deletions(-) diff --git a/CGALimageIO/src/CGALImageIO/CMakeLists.txt b/CGALimageIO/src/CGALImageIO/CMakeLists.txt index ce782368b8b..3236e45a49d 100644 --- a/CGALimageIO/src/CGALImageIO/CMakeLists.txt +++ b/CGALimageIO/src/CGALImageIO/CMakeLists.txt @@ -1,6 +1,10 @@ project (CGAL_ImageIO) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2 FATAL_ERROR) +# Minimal version of CMake: +cmake_minimum_required(VERSION 2.6.2) + +# Tested version: +cmake_policy(VERSION 2.8.4) if ( NOT CGAL_FOUND ) find_package(CGAL REQUIRED) diff --git a/GraphicsView/src/CGALQt4/CMakeLists.txt b/GraphicsView/src/CGALQt4/CMakeLists.txt index 71f7c6226e1..e91b389dc24 100644 --- a/GraphicsView/src/CGALQt4/CMakeLists.txt +++ b/GraphicsView/src/CGALQt4/CMakeLists.txt @@ -1,7 +1,11 @@ project (CGAL_Qt4) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2 FATAL_ERROR) - +# Minimal version of CMake: +cmake_minimum_required(VERSION 2.6.2) + +# Tested version: +cmake_policy(VERSION 2.8.4) + if ( NOT CGAL_FOUND ) find_package(CGAL REQUIRED) endif() diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 93c39f28242..6e991ddecf6 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -5,15 +5,11 @@ # ${CMAKE_BINARY_DIR} or ${CMAKE_BINARY_DIR}. project(CGAL) -cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR) +# Minimal version of CMake: +cmake_minimum_required(VERSION 2.6.2) -# This allows else(), endif(), etc... (without repeating the expression) -set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) - -if ( COMMAND cmake_policy ) - # Libraries linked via full path no longer produce linker search paths. - cmake_policy( SET CMP0003 NEW ) -endif( COMMAND cmake_policy ) +# Tested version: +cmake_policy(VERSION 2.8.4) #-------------------------------------------------------------------------------------------------- # diff --git a/Installation/cmake/modules/CGAL_Common.cmake b/Installation/cmake/modules/CGAL_Common.cmake index f38fd6df484..5b21a32ceba 100644 --- a/Installation/cmake/modules/CGAL_Common.cmake +++ b/Installation/cmake/modules/CGAL_Common.cmake @@ -25,34 +25,6 @@ if( NOT CGAL_COMMON_FILE_INCLUDED ) set( CMAKE_2_6_3_OR_ABOVE FALSE ) endif() - if ( COMMAND cmake_policy ) - # CMP0007 OLD means: list command ignores empty elements - cmake_policy( SET CMP0007 OLD ) - if ( CMAKE_2_6_3_OR_ABOVE ) - # CMP0011 OLD means: Included scripts do NOT automatic cmake_policy - # PUSH and POP. - # We set that policy to OLD to avoid a warning. We probably could - # have set to the NEW policy. - cmake_policy( SET CMP0011 OLD ) - endif() - if(POLICY CMP0017) - # New policy since CMake 2.8.4 - if(NOT RUNNING_CGAL_AUTO_TEST) - # We do not set this in the testsuite, to see the warnings. - cmake_policy( SET CMP0017 OLD ) - endif() - # CMP0017 OLD means: we want to be able to override CMake modules - # that are shipped with CMake. - # For the moment, we override: - # FindBLAS.cmake - # FindBoost.cmake - # FindLAPACK.cmake - # FindOpenGL.cmake - # FindPackageMessage.cmake - # Laurent Rineau, 2011/03/09 - endif() - endif() - if ( "${BUILD_SHARED_LIBS}" STREQUAL "" ) if ( WIN32 ) set(BUILD_SHARED_LIBS OFF) diff --git a/Qt_widget/src/CGALQt3/CMakeLists.txt b/Qt_widget/src/CGALQt3/CMakeLists.txt index 924afdf05e2..c8c0c75e6e4 100644 --- a/Qt_widget/src/CGALQt3/CMakeLists.txt +++ b/Qt_widget/src/CGALQt3/CMakeLists.txt @@ -1,6 +1,10 @@ project (CGAL_Qt3) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2 FATAL_ERROR) +# Minimal version of CMake: +cmake_minimum_required(VERSION 2.6.2) + +# Tested version: +cmake_policy(VERSION 2.8.4) if ( NOT CGAL_FOUND ) find_package(CGAL REQUIRED) From 0631943153e01f933f38c1da95714cc3c0e2c1dc Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 28 Apr 2011 10:36:18 +0000 Subject: [PATCH 2/3] Uniform capitalization in our CMake script: use lowercase for commands --- AABB_tree/examples/AABB_tree/CMakeLists.txt | 2 +- Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt | 2 +- Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt | 2 +- Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt | 2 +- .../demo/Arrangement_on_surface_2/CMakeLists.txt | 2 +- .../demo/Boolean_set_operations_2/CMakeLists.txt | 2 +- CGALimageIO/examples/CGALimageIO/CMakeLists.txt | 2 +- CGALimageIO/test/CGALimageIO/CMakeLists.txt | 2 +- Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt | 2 +- Circular_kernel_3/test/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 +- Convex_hull_d/demo/Convex_hull_d/CMakeLists.txt | 2 +- Core/src/CGALCore/CMakeLists.txt | 2 +- Envelope_3/demo/Envelope_3/CMakeLists.txt | 2 +- Filtered_kernel/benchmark/Filtered_kernel/CMakeLists.txt | 2 +- Generator/benchmark/Generator/CMakeLists.txt | 2 +- Geomview/demo/Geomview/CMakeLists.txt | 2 +- Installation/test/Installation/CMakeLists.txt | 2 +- Interpolation/demo/Interpolation/CMakeLists.txt | 2 +- Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt | 2 +- Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt | 2 +- Kernel_23/test/Kernel_23/CMakeLists.txt | 2 +- .../demo/Kinetic_data_structures/CMakeLists.txt | 2 +- Matrix_search/demo/Matrix_search/CMakeLists.txt | 2 +- Mesh_2/demo/Mesh_2/CMakeLists.txt | 2 +- Mesh_3/examples/Mesh_3/CMakeLists.txt | 2 +- Mesh_3/test/Mesh_3/CMakeLists.txt | 2 +- Min_circle_2/demo/Min_circle_2/CMakeLists.txt | 2 +- Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt | 2 +- Min_quadrilateral_2/demo/Min_quadrilateral_2/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 +- Number_types/test/Number_types/CMakeLists.txt | 2 +- .../demo/Periodic_3_triangulation_3/CMakeLists.txt | 2 +- .../examples/Point_set_processing_3/CMakeLists.txt | 2 +- .../test/Point_set_processing_3/CMakeLists.txt | 2 +- Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt | 2 +- Qt_widget/test/Qt_widget/CMakeLists.txt | 2 +- Ridges_3/examples/Ridges_3/CMakeLists.txt | 2 +- Ridges_3/test/Ridges_3/CMakeLists.txt | 2 +- Robustness/demo/Robustness/CMakeLists.txt | 2 +- .../benchmark/Segment_Delaunay_graph_2/CMakeLists.txt | 2 +- Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt | 2 +- Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt | 2 +- .../examples/Surface_mesh_parameterization/CMakeLists.txt | 2 +- .../test/Surface_mesh_parameterization/CMakeLists.txt | 2 +- Surface_mesher/examples/Surface_mesher/CMakeLists.txt | 2 +- .../examples/Surface_reconstruction_points_3/CMakeLists.txt | 2 +- .../test/Surface_reconstruction_points_3/CMakeLists.txt | 2 +- Triangulation_2/benchmark/Triangulation_2/CMakeLists.txt | 2 +- .../demo/Triangulation_3_Geomview_demos/CMakeLists.txt | 2 +- Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/AABB_tree/examples/AABB_tree/CMakeLists.txt b/AABB_tree/examples/AABB_tree/CMakeLists.txt index 7237e6e9042..2ee8d732e4f 100644 --- a/AABB_tree/examples/AABB_tree/CMakeLists.txt +++ b/AABB_tree/examples/AABB_tree/CMakeLists.txt @@ -3,7 +3,7 @@ project(AABB_examples) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) include_directories(../../include/) diff --git a/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt b/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt index b1553b31c84..7496a0435d7 100644 --- a/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt +++ b/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt @@ -4,7 +4,7 @@ project( Algebraic_kernel_d_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core) diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt b/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt index 988b5da4820..160fccf5d18 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt @@ -4,7 +4,7 @@ project( Algebraic_kernel_d_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt b/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt index fb78a19e5b5..6b671f511f6 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt +++ b/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt @@ -4,7 +4,7 @@ project( Arithmetic_kernel_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) 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 9431fec5c14..666168750e2 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 Core ) 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 6aad33ab4a3..a8f3cf529bd 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) diff --git a/CGALimageIO/examples/CGALimageIO/CMakeLists.txt b/CGALimageIO/examples/CGALimageIO/CMakeLists.txt index 5b57066eea7..04f556d723b 100644 --- a/CGALimageIO/examples/CGALimageIO/CMakeLists.txt +++ b/CGALimageIO/examples/CGALimageIO/CMakeLists.txt @@ -3,7 +3,7 @@ project( CGALImageIO_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS ImageIO ) diff --git a/CGALimageIO/test/CGALimageIO/CMakeLists.txt b/CGALimageIO/test/CGALimageIO/CMakeLists.txt index 78cb041e105..d46cf489986 100644 --- a/CGALimageIO/test/CGALimageIO/CMakeLists.txt +++ b/CGALimageIO/test/CGALimageIO/CMakeLists.txt @@ -4,7 +4,7 @@ project( CGALImageIO_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) include_directories(../../include) diff --git a/Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt b/Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt index bf0a22f6ca6..62ea09dd4e3 100644 --- a/Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt +++ b/Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt @@ -4,7 +4,7 @@ project( Circular_kernel_2_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt b/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt index 1fd101a3365..3956e42e093 100644 --- a/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt +++ b/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt @@ -4,7 +4,7 @@ project( Circular_kernel_3_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt b/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt index 3f7f5925d4f..f278b99c6e8 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) diff --git a/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt b/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt index bc96f69c54c..4f16cc5eaf5 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) diff --git a/Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt b/Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt index 557b321768b..90d5f1c91f0 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Convex_hull_d/demo/Convex_hull_d/CMakeLists.txt b/Convex_hull_d/demo/Convex_hull_d/CMakeLists.txt index f2f85d4eddb..f9b1da7bb89 100644 --- a/Convex_hull_d/demo/Convex_hull_d/CMakeLists.txt +++ b/Convex_hull_d/demo/Convex_hull_d/CMakeLists.txt @@ -4,7 +4,7 @@ project( Convex_hull_d_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Core ) diff --git a/Core/src/CGALCore/CMakeLists.txt b/Core/src/CGALCore/CMakeLists.txt index ff82c3a947a..1a8d1ac7ffc 100644 --- a/Core/src/CGALCore/CMakeLists.txt +++ b/Core/src/CGALCore/CMakeLists.txt @@ -1,6 +1,6 @@ project (CGAL_Core) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2 FATAL_ERROR) +cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR) if ( NOT CGAL_FOUND ) find_package(CGAL REQUIRED) diff --git a/Envelope_3/demo/Envelope_3/CMakeLists.txt b/Envelope_3/demo/Envelope_3/CMakeLists.txt index f083c5503c2..afe285d6dec 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core Qt3 ) diff --git a/Filtered_kernel/benchmark/Filtered_kernel/CMakeLists.txt b/Filtered_kernel/benchmark/Filtered_kernel/CMakeLists.txt index 601f8cb6bc8..caaf5a021c4 100644 --- a/Filtered_kernel/benchmark/Filtered_kernel/CMakeLists.txt +++ b/Filtered_kernel/benchmark/Filtered_kernel/CMakeLists.txt @@ -4,7 +4,7 @@ project( Filtered_kernel_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) add_executable(bench_simple_comparisons bench_simple_comparisons.cpp) diff --git a/Generator/benchmark/Generator/CMakeLists.txt b/Generator/benchmark/Generator/CMakeLists.txt index eddd3948b96..688df06c647 100644 --- a/Generator/benchmark/Generator/CMakeLists.txt +++ b/Generator/benchmark/Generator/CMakeLists.txt @@ -4,7 +4,7 @@ project( Generator_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Geomview/demo/Geomview/CMakeLists.txt b/Geomview/demo/Geomview/CMakeLists.txt index d58082a4650..f19bb296d72 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Installation/test/Installation/CMakeLists.txt b/Installation/test/Installation/CMakeLists.txt index 9a8d3a73934..b0310f86428 100644 --- a/Installation/test/Installation/CMakeLists.txt +++ b/Installation/test/Installation/CMakeLists.txt @@ -4,7 +4,7 @@ project( Installation_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) macro(create_link_to_program COMPONENT ) diff --git a/Interpolation/demo/Interpolation/CMakeLists.txt b/Interpolation/demo/Interpolation/CMakeLists.txt index 7c5727d34d0..7c042a568c5 100644 --- a/Interpolation/demo/Interpolation/CMakeLists.txt +++ b/Interpolation/demo/Interpolation/CMakeLists.txt @@ -4,7 +4,7 @@ project( Interpolation_Demo ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt index ee419452e6f..0b8158f02ba 100644 --- a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt +++ b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt @@ -4,7 +4,7 @@ project( Jet_fitting_3_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt index 9ac67431df8..820b3e89e83 100644 --- a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt +++ b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt @@ -4,7 +4,7 @@ project( Jet_fitting_3_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Kernel_23/test/Kernel_23/CMakeLists.txt b/Kernel_23/test/Kernel_23/CMakeLists.txt index 59a69179baa..4b9ef18eb39 100644 --- a/Kernel_23/test/Kernel_23/CMakeLists.txt +++ b/Kernel_23/test/Kernel_23/CMakeLists.txt @@ -3,7 +3,7 @@ project (Kernel_23_Test) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL) diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt b/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt index dbaa6d6889e..3c005f1baf6 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 Core) diff --git a/Matrix_search/demo/Matrix_search/CMakeLists.txt b/Matrix_search/demo/Matrix_search/CMakeLists.txt index 7a287c0e68b..51798fe1a98 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) diff --git a/Mesh_2/demo/Mesh_2/CMakeLists.txt b/Mesh_2/demo/Mesh_2/CMakeLists.txt index 0232375816e..7a9e7921bdd 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.6.2) +cmake_minimum_required(VERSION 2.6.2) add_subdirectory(Qt3) diff --git a/Mesh_3/examples/Mesh_3/CMakeLists.txt b/Mesh_3/examples/Mesh_3/CMakeLists.txt index 3377beb8328..56eeb8cf124 100644 --- a/Mesh_3/examples/Mesh_3/CMakeLists.txt +++ b/Mesh_3/examples/Mesh_3/CMakeLists.txt @@ -4,7 +4,7 @@ project( Mesh_3_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) include_directories(../../include) include_directories(../../../Triangulation_3/include) diff --git a/Mesh_3/test/Mesh_3/CMakeLists.txt b/Mesh_3/test/Mesh_3/CMakeLists.txt index 1bcb176b05d..70e737736ce 100644 --- a/Mesh_3/test/Mesh_3/CMakeLists.txt +++ b/Mesh_3/test/Mesh_3/CMakeLists.txt @@ -4,7 +4,7 @@ project( Mesh_3_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ImageIO) diff --git a/Min_circle_2/demo/Min_circle_2/CMakeLists.txt b/Min_circle_2/demo/Min_circle_2/CMakeLists.txt index 54929444915..646fad00170 100644 --- a/Min_circle_2/demo/Min_circle_2/CMakeLists.txt +++ b/Min_circle_2/demo/Min_circle_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( Min_circle_2_Demo ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) diff --git a/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt b/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt index 344a7db87fd..c5b09aa2f62 100644 --- a/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt +++ b/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( Min_ellipse_2_Demo ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) diff --git a/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt b/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt index a8d4b11eae3..f1e5a7208da 100644 --- a/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt +++ b/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt @@ -2,7 +2,7 @@ project( min_quadrilateral_2 ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) diff --git a/Nef_2/demo/Nef_2/CMakeLists.txt b/Nef_2/demo/Nef_2/CMakeLists.txt index e0538cc3a51..f7f3b221ccc 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) diff --git a/Nef_3/demo/Nef_3/CMakeLists.txt b/Nef_3/demo/Nef_3/CMakeLists.txt index e650cf0dc32..acf577f281f 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3) include(${CGAL_USE_FILE}) diff --git a/Nef_S2/demo/Nef_S2/CMakeLists.txt b/Nef_S2/demo/Nef_S2/CMakeLists.txt index 97c2b7db477..5ef2bbfa0e7 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) diff --git a/Number_types/test/Number_types/CMakeLists.txt b/Number_types/test/Number_types/CMakeLists.txt index 5173834b039..3fc0c170770 100644 --- a/Number_types/test/Number_types/CMakeLists.txt +++ b/Number_types/test/Number_types/CMakeLists.txt @@ -5,7 +5,7 @@ project( Number_types_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package( CGAL QUIET COMPONENTS Core ) 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 e92920dea19..e033c0ed2dd 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 @@ -3,7 +3,7 @@ project( Periodic_3_triangulation_3_demo ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) # Find CGAL find_package(CGAL) diff --git a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt index 8827b1d2fa0..2bf487bb1c2 100644 --- a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt +++ b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt @@ -2,7 +2,7 @@ project( Point_set_processing_3_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) # Require packages new or improved since CGAL 3.4 include_directories (BEFORE ../../../Installation/include/) diff --git a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt index f9a86ba7b06..266e959c6c2 100644 --- a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt +++ b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt @@ -2,7 +2,7 @@ project( Point_set_processing_3_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) # Require packages new or improved since CGAL 3.4 include_directories (BEFORE ../../../Installation/include/) diff --git a/Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt b/Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt index a100b3bd32a..a59d997483c 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Qt_widget/test/Qt_widget/CMakeLists.txt b/Qt_widget/test/Qt_widget/CMakeLists.txt index 6c99be99c5a..9831d6aef9a 100644 --- a/Qt_widget/test/Qt_widget/CMakeLists.txt +++ b/Qt_widget/test/Qt_widget/CMakeLists.txt @@ -2,7 +2,7 @@ project( Qt_widget_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) diff --git a/Ridges_3/examples/Ridges_3/CMakeLists.txt b/Ridges_3/examples/Ridges_3/CMakeLists.txt index bf56d4f99ec..721a81555f9 100644 --- a/Ridges_3/examples/Ridges_3/CMakeLists.txt +++ b/Ridges_3/examples/Ridges_3/CMakeLists.txt @@ -1,7 +1,7 @@ # This is the CMake script for compiling a CGAL application. project( Ridges_3_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET ) diff --git a/Ridges_3/test/Ridges_3/CMakeLists.txt b/Ridges_3/test/Ridges_3/CMakeLists.txt index 54c314942e8..e30308a00c4 100644 --- a/Ridges_3/test/Ridges_3/CMakeLists.txt +++ b/Ridges_3/test/Ridges_3/CMakeLists.txt @@ -4,7 +4,7 @@ project( Ridges_3_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Robustness/demo/Robustness/CMakeLists.txt b/Robustness/demo/Robustness/CMakeLists.txt index ab6f6f9d7ea..48b674626fd 100644 --- a/Robustness/demo/Robustness/CMakeLists.txt +++ b/Robustness/demo/Robustness/CMakeLists.txt @@ -2,7 +2,7 @@ project( robustness ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) diff --git a/Segment_Delaunay_graph_2/benchmark/Segment_Delaunay_graph_2/CMakeLists.txt b/Segment_Delaunay_graph_2/benchmark/Segment_Delaunay_graph_2/CMakeLists.txt index 1e6e1835e89..7082e13d846 100644 --- a/Segment_Delaunay_graph_2/benchmark/Segment_Delaunay_graph_2/CMakeLists.txt +++ b/Segment_Delaunay_graph_2/benchmark/Segment_Delaunay_graph_2/CMakeLists.txt @@ -4,7 +4,7 @@ project( Segment_Delaunay_graph_2_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt b/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt index 331c887bdc4..7596a48bbaa 100644 --- a/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt +++ b/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt @@ -3,7 +3,7 @@ project( Skin_surface_3_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL) diff --git a/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt index 8e0c148bb30..108ee450ccf 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 Core ) include( ${CGAL_USE_FILE} ) diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt index 048fd73245c..c30cac647d4 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt @@ -3,7 +3,7 @@ project( Surface_mesh_parameterization_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) # Require packages new or improved since CGAL 3.4 include_directories (BEFORE ../../../Installation/include/) diff --git a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt index e44bde2d266..2b195a95d66 100644 --- a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt @@ -3,7 +3,7 @@ project( Surface_mesh_parameterization_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) # Require packages new or improved since CGAL 3.4 include_directories (BEFORE ../../../Installation/include/) diff --git a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt index 9736b705d96..8c5712ad249 100644 --- a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt +++ b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt @@ -3,7 +3,7 @@ project( Surface_mesher_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) include_directories(../../include) diff --git a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/CMakeLists.txt b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/CMakeLists.txt index 6119442b915..c4801f0a6ef 100644 --- a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/CMakeLists.txt +++ b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/CMakeLists.txt @@ -2,7 +2,7 @@ project( Surface_reconstruction_points_3_example ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) # Require packages new or improved since CGAL 3.5 beta 1 include_directories (BEFORE ../../../Installation/include) diff --git a/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/CMakeLists.txt b/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/CMakeLists.txt index 7ec1e948bc5..b1c4eda6c92 100644 --- a/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/CMakeLists.txt +++ b/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/CMakeLists.txt @@ -2,7 +2,7 @@ project( Surface_reconstruction_points_3_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) # Require packages new or improved since CGAL 3.5 beta 1 include_directories (BEFORE ../../../Installation/include/) diff --git a/Triangulation_2/benchmark/Triangulation_2/CMakeLists.txt b/Triangulation_2/benchmark/Triangulation_2/CMakeLists.txt index 1f9370c363c..8dceff46ce8 100644 --- a/Triangulation_2/benchmark/Triangulation_2/CMakeLists.txt +++ b/Triangulation_2/benchmark/Triangulation_2/CMakeLists.txt @@ -4,7 +4,7 @@ project( Triangulation_2_test ) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Triangulation_3/demo/Triangulation_3_Geomview_demos/CMakeLists.txt b/Triangulation_3/demo/Triangulation_3_Geomview_demos/CMakeLists.txt index cc6ca97f44c..59dc3f9cb25 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL QUIET COMPONENTS Core ) diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt b/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt index 03960e9c4e2..98abfd7acf2 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.6.2) +cmake_minimum_required(VERSION 2.6.2) find_package(CGAL COMPONENTS Qt3 ) include( ${CGAL_USE_FILE} ) From 82f952223eb2a3663bf14a6f730fbfcb1f94ae18 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 28 Apr 2011 10:37:38 +0000 Subject: [PATCH 3/3] Uniform capitalization in our CMake script: use lowercase for commands --- Scripts/scripts/cgal_create_cmake_script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/scripts/cgal_create_cmake_script b/Scripts/scripts/cgal_create_cmake_script index 33ccf095fdc..3ddc44b18ed 100755 --- a/Scripts/scripts/cgal_create_cmake_script +++ b/Scripts/scripts/cgal_create_cmake_script @@ -44,7 +44,7 @@ project( ${PROJECT}_${TYPE} ) EOF cat <<'EOF' -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) EOF