From a32c77a04c210f3aba2dbc11147b92000b8a1873 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Thu, 23 Aug 2018 12:07:44 +0200
Subject: [PATCH] [cmake] More checking for the presence of
consistent-edge-orientation
---
cmake/modules/DunePerftoolMacros.cmake | 3 +++
test/sumfact/poisson/CMakeLists.txt | 23 ++++++++++++-----------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/cmake/modules/DunePerftoolMacros.cmake b/cmake/modules/DunePerftoolMacros.cmake
index d5557d41..6302c1a1 100644
--- a/cmake/modules/DunePerftoolMacros.cmake
+++ b/cmake/modules/DunePerftoolMacros.cmake
@@ -119,6 +119,9 @@ function(add_generated_executable)
set(ANALYZE_GRID_FILE)
set(ANALYZE_GRID_OPTION)
if(GEN_ANALYZE_GRID)
+ if(NOT consistent-edge-orientation_FOUND)
+ message(FATAL_ERROR "Asked for grid analysis, but the module consistent-edge-orientation was not found!"
+ endif()
set(ANALYZE_GRID_FILE "${GEN_INIFILE}.csv")
set(ANALYZE_GRID_OPTION "--grid-info=${ANALYZE_GRID_FILE}")
add_custom_command(OUTPUT ${ANALYZE_GRID_FILE}
diff --git a/test/sumfact/poisson/CMakeLists.txt b/test/sumfact/poisson/CMakeLists.txt
index 260a5f53..a304dc7f 100644
--- a/test/sumfact/poisson/CMakeLists.txt
+++ b/test/sumfact/poisson/CMakeLists.txt
@@ -50,17 +50,18 @@ dune_add_formcompiler_system_test(UFLFILE poisson_3d.ufl
#==================================
# Poisson DG on 'unstructured grid'
#==================================
-dune_add_formcompiler_system_test(UFLFILE poisson_dg_2d.ufl
- BASENAME sumfact_poisson_dg_2d_unstructured
- INIFILE poisson_dg_2d_unstructured.mini
- ANALYZE_GRID
- )
-dune_add_formcompiler_system_test(UFLFILE poisson_dg_3d.ufl
- BASENAME sumfact_poisson_dg_3d_unstructured
- INIFILE poisson_dg_3d_unstructured.mini
- ANALYZE_GRID
- )
-
+if(consistent-edge-orientation_FOUND)
+ dune_add_formcompiler_system_test(UFLFILE poisson_dg_2d.ufl
+ BASENAME sumfact_poisson_dg_2d_unstructured
+ INIFILE poisson_dg_2d_unstructured.mini
+ ANALYZE_GRID
+ )
+ dune_add_formcompiler_system_test(UFLFILE poisson_dg_3d.ufl
+ BASENAME sumfact_poisson_dg_3d_unstructured
+ INIFILE poisson_dg_3d_unstructured.mini
+ ANALYZE_GRID
+ )
+endif()
#=============================================
# Poisson DG using FastDGGridOperator in 2D/3D
--
GitLab