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

Merge pull request #2580 from lrineau/CGAL-Support_CMake_3.10-GF 

Renew the handle of policies, for CMake-3.10
This commit is contained in:
Laurent Rineau 2017-11-15 16:47:42 +01:00
parent 6a59fa98d5 62c70d41ca
commit 3ff09bc549
62 changed files with 182 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AABB_tree/demo/AABB_tree/CMakeLists.txt
View File

@ -6,14 +6,12 @@ project( AABB_tree_Demo )
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed. # Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
if(POLICY CMP0071) if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW) cmake_policy(SET CMP0071 NEW)
endif() endif()

8
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
View File

@ -7,13 +7,11 @@ project (Alpha_shapes_3_Demo)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed. # Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
if(POLICY CMP0071) if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW) cmake_policy(SET CMP0071 NEW)
endif() endif()

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

@ -2,13 +2,11 @@
project( Arrangement_on_surface_2_Demo ) project( Arrangement_on_surface_2_Demo )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Core Qt5 ) find_package(CGAL COMPONENTS Core Qt5 )
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )

5
BGL/test/BGL/CMakeLists.txt
View File

@ -7,11 +7,6 @@ project( BGL_Tests )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

8
Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project( Boolean_set_operations_2_GraphicsView_Demo ) project( Boolean_set_operations_2_GraphicsView_Demo )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5 Core ) find_package(CGAL COMPONENTS Qt5 Core )

5
CGAL_Core/examples/Core/CMakeLists.txt
View File

@ -4,11 +4,6 @@ project( Core_Examples )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS Core ) find_package( CGAL QUIET COMPONENTS Core )

8
CGAL_ImageIO/archive/demo/CGALimageIO/CMakeLists.txt
View File

@ -1,12 +1,10 @@
project(CGALimageIO_Demo) project(CGALimageIO_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
set(PACKAGE_ROOT ../..) set(PACKAGE_ROOT ../..)

6
CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
View File

@ -1,12 +1,10 @@
project(CGAL_ipelets_Demo) project(CGAL_ipelets_Demo)
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
macro( remove_leading_zero var ) macro( remove_leading_zero var )
string(SUBSTRING "${${var}}" 0 1 ONECHAR) string(SUBSTRING "${${var}}" 0 1 ONECHAR)

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

@ -6,10 +6,6 @@ project( Circular_kernel_2_Tests )
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
find_package(CGAL QUIET) find_package(CGAL QUIET)
if ( CGAL_FOUND ) if ( CGAL_FOUND )

8
Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
View File

@ -1,12 +1,10 @@
project (Circular_kernel_3_Demo) project (Circular_kernel_3_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

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

@ -6,10 +6,6 @@ project( Circular_kernel_3_Tests )
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
find_package(CGAL QUIET COMPONENTS Core ) find_package(CGAL QUIET COMPONENTS Core )
if ( CGAL_FOUND ) if ( CGAL_FOUND )

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

@ -4,15 +4,13 @@
project( Convex_hull_3_Demo ) project( Convex_hull_3_Demo )
set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) cmake_minimum_required(VERSION 3.1)
if(NOT POLICY CMP0070 AND POLICY CMP0053)
cmake_minimum_required(VERSION 2.8.11) # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE)
endif()
find_package(CGAL QUIET) find_package(CGAL QUIET)

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

@ -4,15 +4,13 @@
project( Geomview_Demo ) project( Geomview_Demo )
set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) cmake_minimum_required(VERSION 3.1)
if(NOT POLICY CMP0070 AND POLICY CMP0053)
cmake_minimum_required(VERSION 2.8.11) # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE)
endif()
find_package(CGAL QUIET) find_package(CGAL QUIET)

8
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Alpha_shapes_2_Demo) project (Alpha_shapes_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

8
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Apollonius_graph_2_Demo) project (Apollonius_graph_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

8
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Bounding_volumes_Demo) project (Bounding_volumes_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

8
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Circular_kernel_2_Demo) project (Circular_kernel_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

8
GraphicsView/demo/Generator/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Generator_Demo) project (Generator_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

8
GraphicsView/demo/GraphicsView/CMakeLists.txt
View File

@ -2,13 +2,11 @@
project (GraphicsView_Demo) project (GraphicsView_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

8
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (L1_Voronoi_diagram_2_Demo) project (L1_Voronoi_diagram_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

8
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Largest_empty_rect_2_Demo) project (Largest_empty_rect_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

14
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
View File

@ -1,12 +1,10 @@
project (Periodic_2_triangulation_2_Demo) project (Periodic_2_triangulation_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
@ -36,6 +34,12 @@ qt5_add_resources ( CGAL_Qt5_RESOURCE_FILES ./Periodic_2_triangulation_2.qrc )
qt5_generate_moc( Periodic_2_Delaunay_triangulation_2.cpp Periodic_2_triangulation_2.moc ) qt5_generate_moc( Periodic_2_Delaunay_triangulation_2.cpp Periodic_2_triangulation_2.moc )
# find header files for projects that can show them # find header files for projects that can show them
cmake_minimum_required(VERSION 3.1)
if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD)
endif()
file(GLOB headers "*.h") file(GLOB headers "*.h")
file(GLOB QT_headers "include/CGAL/Qt/*.h") file(GLOB QT_headers "include/CGAL/Qt/*.h")
file(GLOB P2T2_headers "../../../include/CGAL/*.h") file(GLOB P2T2_headers "../../../include/CGAL/*.h")

8
GraphicsView/demo/Polygon/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Polygon_Demo) project (Polygon_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5 Core) find_package(CGAL COMPONENTS Qt5 Core)

8
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Segment_Delaunay_graph_2_Demo) project (Segment_Delaunay_graph_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5 Core) find_package(CGAL COMPONENTS Qt5 Core)

8
GraphicsView/demo/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Segment_Delaunay_graph_Linf_2_Demo) project (Segment_Delaunay_graph_Linf_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5 Core) find_package(CGAL COMPONENTS Qt5 Core)

8
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Snap_rounding_2_Demo) project (Snap_rounding_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

8
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Spatial_searching_2_Demo) project (Spatial_searching_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

8
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Stream_lines_2_Demo) project (Stream_lines_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

8
GraphicsView/demo/Triangulation_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Triangulation_2_Demo) project (Triangulation_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

6
GraphicsView/src/CGAL_Qt5/CMakeLists.txt
View File

@ -1,11 +1,9 @@
message("Configuring libCGAL_Qt5") message("Configuring libCGAL_Qt5")
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
if($ENV{CGAL_FAKE_PUBLIC_RELEASE}) if($ENV{CGAL_FAKE_PUBLIC_RELEASE})
add_definitions( -DCGAL_FAKE_PUBLIC_RELEASE ) add_definitions( -DCGAL_FAKE_PUBLIC_RELEASE )

5
Hash_map/benchmark/Hash_map/CMakeLists.txt
View File

@ -13,11 +13,6 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
endif() endif()
endif() endif()
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

20
Installation/CMakeLists.txt
View File

@ -8,26 +8,10 @@ if(NOT PROJECT_NAME)
endif() endif()
# Minimal version of CMake: # Minimal version of CMake:
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
# Tested version: # Tested version:
cmake_policy(VERSION 2.8.11) cmake_policy(VERSION 3.1)
#
# Compatibility with CMake 3.0
#
if(POLICY CMP0042)
# Do not enable the use of MACOSX_RPATH
# http://www.cmake.org/cmake/help/v3.0/policy/CMP0042.html
cmake_policy(SET CMP0042 OLD)
endif()
# Compatibility with CMake 3.1
if(POLICY CMP0054)
# http://www.cmake.org/cmake/help/v3.1/policy/CMP0054.html
# See the discussion https://github.com/CGAL/cgal/issues/189
cmake_policy(SET CMP0054 NEW)
endif()
if(POLICY CMP0056) if(POLICY CMP0056)
# http://www.cmake.org/cmake/help/v3.2/policy/CMP0056.html # http://www.cmake.org/cmake/help/v3.2/policy/CMP0056.html

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

@ -4,15 +4,13 @@
project( Interpolation_Demo ) project( Interpolation_Demo )
set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) cmake_minimum_required(VERSION 3.1)
if(NOT POLICY CMP0070 AND POLICY CMP0053)
cmake_minimum_required(VERSION 2.8.11) # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE)
endif()
find_package(CGAL QUIET) find_package(CGAL QUIET)

8
Linear_cell_complex/benchmark/Linear_cell_complex_3/CMakeLists.txt
View File

@ -1,12 +1,10 @@
project(LCC_performance_3) project(LCC_performance_3)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL REQUIRED) find_package(CGAL REQUIRED)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

18
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
View File

@ -4,22 +4,20 @@
project (Linear_cell_complex_Demo) project (Linear_cell_complex_Demo)
# Find includes in corresponding build directories cmake_minimum_required(VERSION 3.1)
set(CMAKE_INCLUDE_CURRENT_DIR ON) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Instruct CMake to run moc automatically when needed. # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
set(CMAKE_AUTOMOC ON)
cmake_minimum_required(VERSION 2.8.11)
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
if(POLICY CMP0071) if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW) cmake_policy(SET CMP0071 NEW)
endif() endif()
# Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)
## To add expensive tests ## To add expensive tests
# add_definitions("-DCGAL_CHECK_EXPENSIVE") # add_definitions("-DCGAL_CHECK_EXPENSIVE")
# add_definitions("-Wall -Wextra") # add_definitions("-Wall -Wextra")

8
Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project( Linear_cell_complex_Examples ) project( Linear_cell_complex_Examples )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
# If you want to visualize a linear cell complex, you can use the following viewer # If you want to visualize a linear cell complex, you can use the following viewer
# based on qt. Just uncomment the following two lines, plus the lines qt5_use_modules below # based on qt. Just uncomment the following two lines, plus the lines qt5_use_modules below

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

@ -3,14 +3,12 @@
project( Mesh_2_Demo ) project( Mesh_2_Demo )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL QUIET) find_package(CGAL QUIET)
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )

8
Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt
View File

@ -2,13 +2,11 @@
project(Optimal_transportation_reconstruction_2_Demo) project(Optimal_transportation_reconstruction_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
# Include this package's headers first # Include this package's headers first
include_directories( BEFORE ./ ./include ../../include ) include_directories( BEFORE ./ ./include ../../include )

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

@ -4,13 +4,11 @@
project( Periodic_3_triangulation_3_Demo ) project( Periodic_3_triangulation_3_Demo )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
# Find CGAL # Find CGAL
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

17
Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
View File

@ -3,21 +3,20 @@
project (Periodic_Lloyd_3_Demo) project (Periodic_Lloyd_3_Demo)
# Find includes in corresponding build directories cmake_minimum_required(VERSION 3.1)
set(CMAKE_INCLUDE_CURRENT_DIR ON) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Instruct CMake to run moc automatically when needed. # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
set(CMAKE_AUTOMOC ON)
cmake_minimum_required(VERSION 2.8.11)
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
if(POLICY CMP0071) if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW) cmake_policy(SET CMP0071 NEW)
endif() endif()
# Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

5
Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt
View File

@ -13,11 +13,6 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
endif() endif()
endif() endif()
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

5
Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
View File

@ -13,11 +13,6 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
endif() endif()
endif() endif()
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

5
Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt
View File

@ -13,11 +13,6 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
endif() endif()
endif() endif()
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

27
Polyhedron/demo/Polyhedron/CMakeLists.txt
View File

@ -1,21 +1,21 @@
# This is the CMake script for compiling the CGAL Polyhedron demo. # This is the CMake script for compiling the CGAL Polyhedron demo.
project( Polyhedron_Demo ) project( Polyhedron_Demo )
cmake_minimum_required(VERSION 3.1)
if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD)
endif()
if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW)
endif()
# Find includes in corresponding build directories # Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed. # Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD)
endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW)
endif()
list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_generalized_initializers has_cpp11) list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_generalized_initializers has_cpp11)
if(has_cpp11 LESS 0) if(has_cpp11 LESS 0)
@ -27,13 +27,6 @@ endif()
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
# Compatibility with CMake 3.0
if(POLICY CMP0042)
# Do not enable the use of MACOSX_RPATH
# http://www.cmake.org/cmake/help/v3.0/policy/CMP0042.html
cmake_policy(SET CMP0042 OLD)
endif()
#Defines flags to emulate windows behavior for linking error generation #Defines flags to emulate windows behavior for linking error generation
if(CMAKE_CXX_COMPILER_ID EQUAL Clang OR CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_CXX_COMPILER_ID EQUAL Clang OR CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
if(UNIX OR APPLE) if(UNIX OR APPLE)

8
Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
View File

@ -2,13 +2,11 @@
project( Mesh_3_implicit_functions ) project( Mesh_3_implicit_functions )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
# Let plugins be compiled in the same directory as the executable. # Let plugins be compiled in the same directory as the executable.
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")

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

@ -4,15 +4,13 @@
project( Polyhedron_IO_Demo ) project( Polyhedron_IO_Demo )
set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) cmake_minimum_required(VERSION 3.1)
if(NOT POLICY CMP0070 AND POLICY CMP0053)
cmake_minimum_required(VERSION 2.8.11) # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE)
endif()
find_package(CGAL QUIET) find_package(CGAL QUIET)

8
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
View File

@ -3,13 +3,11 @@
project (Polyline_simplification_2_Demo) project (Polyline_simplification_2_Demo)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)

5
Polyline_simplification_2/test/Polyline_simplification_2/CMakeLists.txt
View File

@ -7,11 +7,6 @@ project( Polyline_simplification_2_Tests )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

8
Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
View File

@ -2,13 +2,11 @@
project( Principal_component_analysis_Demo ) project( Principal_component_analysis_Demo )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
foreach(INCDIR ../../include ../../../STL_Extension/include ../../../GraphicsView/include ../../../filtered_kernel/include ) foreach(INCDIR ../../include ../../../STL_Extension/include ../../../GraphicsView/include ../../../filtered_kernel/include )
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${INCDIR}") if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${INCDIR}")

5
Spatial_searching/examples/Spatial_searching/CMakeLists.txt
View File

@ -7,11 +7,6 @@ project( Spatial_searching_Examples )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

5
Stream_support/benchmark/Stream_support/CMakeLists.txt
View File

@ -7,11 +7,6 @@ project( Stream_support )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

12
Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt
View File

@ -4,15 +4,13 @@
project( Surface_mesh_deformation_Demo ) project( Surface_mesh_deformation_Demo )
set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) cmake_minimum_required(VERSION 3.1)
if(NOT POLICY CMP0070 AND POLICY CMP0053)
cmake_minimum_required(VERSION 2.8.11) # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD) set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE)
endif()
find_package(CGAL QUIET) find_package(CGAL QUIET)

5
Surface_mesh_segmentation/examples/Surface_mesh_segmentation/CMakeLists.txt
View File

@ -7,11 +7,6 @@ project( Surface_mesh_segmentation_Examples )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

5
Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt
View File

@ -7,11 +7,6 @@ project( Surface_mesh_simplification_Examples )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

5
Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/CMakeLists.txt
View File

@ -10,11 +10,6 @@ project( Mean_curvature_skeleton )
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

13
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
View File

@ -2,18 +2,17 @@ set ( prj Surface_mesher )
project ( Surface_mesher_Demo ) project ( Surface_mesher_Demo )
cmake_minimum_required(VERSION 3.1)
if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD)
endif()
# Find includes in corresponding build directories # Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed. # Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
cmake_minimum_required(VERSION 2.8.11)
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD)
endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
if(POLICY CMP0071) if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW) cmake_policy(SET CMP0071 NEW)
endif() endif()

5
Sweep_line_2/examples/Sweep_line_2/CMakeLists.txt
View File

@ -13,11 +13,6 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
endif() endif()
endif() endif()
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

20
Three/demo/Three/Example_plugin/CMakeLists.txt
View File

@ -1,22 +1,14 @@
project( Example_plugin ) project( Example_plugin )
cmake_minimum_required(VERSION 3.1)
if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD)
endif()
# Find includes in corresponding build directories # Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed. # Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
cmake_minimum_required(VERSION 2.8.11)
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD)
endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
# Compatibility with CMake 3.0
if(POLICY CMP0042)
# Do not enable the use of MACOSX_RPATH
# http://www.cmake.org/cmake/help/v3.0/policy/CMP0042.html
cmake_policy(SET CMP0042 OLD)
endif()
#Find CGAL #Find CGAL
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )

26
Three/doc/Three/Three.txt
View File

@ -317,17 +317,8 @@ Configure CMake as you desire and fetch the right Qt5 packages :
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed. # Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
# Compatibility with CMake 3.0
if(POLICY CMP0042)
# Do not enable the use of MACOSX_RPATH
# http://www.cmake.org/cmake/help/v3.0/policy/CMP0042.html
cmake_policy(SET CMP0042 OLD)
endif()
#Find CGAL #Find CGAL
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )
@ -364,17 +355,8 @@ Notice that an external plugin will not be automatically loaded in the Polyhedro
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed. # Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
# Compatibility with CMake 3.0
if(POLICY CMP0042)
# Do not enable the use of MACOSX_RPATH
# http://www.cmake.org/cmake/help/v3.0/policy/CMP0042.html
cmake_policy(SET CMP0042 OLD)
endif()
#Find CGAL #Find CGAL
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )

5
Triangulation/applications/Triangulation/CMakeLists.txt
View File

@ -15,11 +15,6 @@ endif()
set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true ) set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true )
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
endif()
# CGAL and its components # CGAL and its components
find_package( CGAL QUIET COMPONENTS ) find_package( CGAL QUIET COMPONENTS )

21
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
View File

@ -3,24 +3,21 @@
project (Triangulation_3_Demo) project (Triangulation_3_Demo)
cmake_minimum_required(VERSION 3.1)
if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD)
endif()
if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW)
endif()
# Find includes in corresponding build directories # Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed. # Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
cmake_minimum_required(VERSION 2.8.11)
if(POLICY CMP0053)
cmake_policy(SET CMP0053 OLD)
endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW)
endif()
find_package(CGAL COMPONENTS Qt5) find_package(CGAL COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})

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

@ -4,13 +4,11 @@
project( Triangulation_3_Geomview_demos_Demo ) project( Triangulation_3_Geomview_demos_Demo )
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.1)
if(POLICY CMP0053) if(NOT POLICY CMP0070 AND POLICY CMP0053)
# Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
cmake_policy(SET CMP0053 OLD) cmake_policy(SET CMP0053 OLD)
endif() endif()
if(POLICY CMP0043)
cmake_policy(SET CMP0043 OLD)
endif()
set_directory_properties(PROPERTIES CGAL_NO_TESTING TRUE) set_directory_properties(PROPERTIES CGAL_NO_TESTING TRUE)