songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from next

This commit is contained in:
Eric Berberich 2011-04-28 10:51:25 +00:00
parent fb11ed74b6 82f952223e
commit 026e830dec
61 changed files with 76 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AABB_tree/examples/AABB_tree/CMakeLists.txt
View File

@ -3,7 +3,7 @@
project(AABB_examples)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
cmake_minimum_required(VERSION 2.6.2)
include_directories(../../include/)

2
Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt
View File

@ -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)

2
Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt
View File

@ -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 )

2
Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
View File

@ -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 )

2
Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
View File

@ -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 )

2
Boolean_set_operations_2/demo/Boolean_set_operations_2/CMakeLists.txt
View File

@ -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} )

2
CGALimageIO/examples/CGALimageIO/CMakeLists.txt
View File

@ -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 )

6
CGALimageIO/src/CGALImageIO/CMakeLists.txt
View File

@ -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 zlib OpenGL)

2
CGALimageIO/test/CGALimageIO/CMakeLists.txt
View File

@ -4,7 +4,7 @@
project( CGALImageIO_test )
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
cmake_minimum_required(VERSION 2.6.2)
include_directories(../../include)

2
Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt
View File

@ -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 )

2
Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt
View File

@ -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 )

2
Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt
View File

@ -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} )

2
Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt
View File

@ -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} )

2
Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt
View File

@ -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 )

2
Convex_hull_d/demo/Convex_hull_d/CMakeLists.txt
View File

@ -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 )

2
Core/src/CGALCore/CMakeLists.txt
View File

@ -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 )
# need CGAL with GMP

2
Envelope_3/demo/Envelope_3/CMakeLists.txt
View File

@ -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 )

2
Filtered_kernel/benchmark/Filtered_kernel/CMakeLists.txt
View File

@ -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)

2
Generator/benchmark/Generator/CMakeLists.txt
View File

@ -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 )

2
Geomview/demo/Geomview/CMakeLists.txt
View File

@ -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 )

8
GraphicsView/src/CGALQt4/CMakeLists.txt
View File

@ -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()

12
Installation/CMakeLists.txt
View File

@ -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)
#--------------------------------------------------------------------------------------------------
#

28
Installation/cmake/modules/CGAL_Common.cmake
View File

@ -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)

2
Installation/test/Installation/CMakeLists.txt
View File

@ -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 )

2
Interpolation/demo/Interpolation/CMakeLists.txt
View File

@ -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 )

2
Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
View File

@ -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 )

2
Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt
View File

@ -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 )

2
Kernel_23/test/Kernel_23/CMakeLists.txt
View File

@ -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)

2
Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt
View File

@ -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)

2
Matrix_search/demo/Matrix_search/CMakeLists.txt
View File

@ -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} )

2
Mesh_2/demo/Mesh_2/CMakeLists.txt
View File

@ -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)

2
Mesh_3/examples/Mesh_3/CMakeLists.txt
View File

@ -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)

2
Mesh_3/test/Mesh_3/CMakeLists.txt
View File

@ -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)

2
Min_circle_2/demo/Min_circle_2/CMakeLists.txt
View File

@ -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} )

2
Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt
View File

@ -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} )

2
Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt
View File

@ -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} )

2
Nef_2/demo/Nef_2/CMakeLists.txt
View File

@ -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} )

2
Nef_3/demo/Nef_3/CMakeLists.txt
View File

@ -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})

2
Nef_S2/demo/Nef_S2/CMakeLists.txt
View File

@ -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} )

2
Number_types/test/Number_types/CMakeLists.txt
View File

@ -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 )

2
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
View File

@ -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)

2
Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
View File

@ -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/)

2
Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
View File

@ -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/)

2
Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt
View File

@ -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 )

6
Qt_widget/src/CGALQt3/CMakeLists.txt
View File

@ -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)

2
Qt_widget/test/Qt_widget/CMakeLists.txt
View File

@ -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} )

2
Ridges_3/examples/Ridges_3/CMakeLists.txt
View File

@ -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 )

2
Ridges_3/test/Ridges_3/CMakeLists.txt
View File

@ -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 )

2
Robustness/demo/Robustness/CMakeLists.txt
View File

@ -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} )

2
Scripts/scripts/cgal_create_cmake_script
View File

@ -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

2
Segment_Delaunay_graph_2/benchmark/Segment_Delaunay_graph_2/CMakeLists.txt
View File

@ -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 )

2
Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
View File

@ -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)

2
Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt
View File

@ -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} )

2
Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
View File

@ -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/)

2
Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt
View File

@ -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/)

2
Surface_mesher/examples/Surface_mesher/CMakeLists.txt
View File

@ -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)

2
Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/CMakeLists.txt
View File

@ -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)

2
Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/CMakeLists.txt
View File

@ -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/)

2
Triangulation_2/benchmark/Triangulation_2/CMakeLists.txt
View File

@ -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 )

2
Triangulation_3/demo/Triangulation_3_Geomview_demos/CMakeLists.txt
View File

@ -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 )

2
Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt
View File

@ -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} )