From e73c95d4cd0283ba990b45df3d8c49318a78dc9b Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 20 Oct 2017 17:01:43 +0200 Subject: [PATCH] Do not test demos --- Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt | 2 ++ Geomview/demo/Geomview/CMakeLists.txt | 2 ++ Installation/cmake/modules/CGAL_Macros.cmake | 4 ---- Interpolation/demo/Interpolation/CMakeLists.txt | 2 ++ Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt | 2 ++ .../demo/Surface_mesh_deformation/CMakeLists.txt | 2 ++ 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt b/Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt index 5f5be576dd5..9869af79085 100644 --- a/Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt +++ b/Convex_hull_3/demo/Convex_hull_3/CMakeLists.txt @@ -4,6 +4,8 @@ project( Convex_hull_3_Demo ) +set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) + cmake_minimum_required(VERSION 2.8.11) if(POLICY CMP0053) cmake_policy(SET CMP0053 OLD) diff --git a/Geomview/demo/Geomview/CMakeLists.txt b/Geomview/demo/Geomview/CMakeLists.txt index 475b60d80cd..7baf8748c0f 100644 --- a/Geomview/demo/Geomview/CMakeLists.txt +++ b/Geomview/demo/Geomview/CMakeLists.txt @@ -4,6 +4,8 @@ project( Geomview_Demo ) +set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) + cmake_minimum_required(VERSION 2.8.11) if(POLICY CMP0053) cmake_policy(SET CMP0053 OLD) diff --git a/Installation/cmake/modules/CGAL_Macros.cmake b/Installation/cmake/modules/CGAL_Macros.cmake index a0ba6a6cf74..c0520f3ea44 100644 --- a/Installation/cmake/modules/CGAL_Macros.cmake +++ b/Installation/cmake/modules/CGAL_Macros.cmake @@ -722,10 +722,6 @@ function(process_CGAL_subdirectory entry subdir type_name) endif() endif() endif() - if(source_dir AND type_name STREQUAL "demo") - # Do not test demos - set_property(DIRECTORY "${entry}" PROPERTY CGAL_NO_TESTING TRUE) - endif() else() message(STATUS "${subdir}/${ENTRY_DIR_NAME} is in dont_submit") endif() diff --git a/Interpolation/demo/Interpolation/CMakeLists.txt b/Interpolation/demo/Interpolation/CMakeLists.txt index fc937069f8c..308a2877587 100644 --- a/Interpolation/demo/Interpolation/CMakeLists.txt +++ b/Interpolation/demo/Interpolation/CMakeLists.txt @@ -4,6 +4,8 @@ project( Interpolation_Demo ) +set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) + cmake_minimum_required(VERSION 2.8.11) if(POLICY CMP0053) cmake_policy(SET CMP0053 OLD) diff --git a/Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt b/Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt index 774db467df5..eb51b3f7604 100644 --- a/Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt +++ b/Polyhedron_IO/demo/Polyhedron_IO/CMakeLists.txt @@ -4,6 +4,8 @@ project( Polyhedron_IO_Demo ) +set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) + cmake_minimum_required(VERSION 2.8.11) if(POLICY CMP0053) cmake_policy(SET CMP0053 OLD) diff --git a/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt index 383f1edd510..eca598d8baa 100644 --- a/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt +++ b/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt @@ -4,6 +4,8 @@ project( Surface_mesh_deformation_Demo ) +set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) + cmake_minimum_required(VERSION 2.8.11) if(POLICY CMP0053) cmake_policy(SET CMP0053 OLD)