From c9bc2a0517f605d77479c56ddab049bc3812e1cb Mon Sep 17 00:00:00 2001 From: Tobias Leibner <l_tobi01@STINSON.uni-muenster.de> Date: Fri, 9 Dec 2016 15:06:21 +0100 Subject: [PATCH] [test] use correct EIGEN3_FOUND cmake guard --- dune/xt/la/test/matrices.mini | 2 +- dune/xt/la/test/solver.mini | 1 + dune/xt/la/test/vectors.mini | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dune/xt/la/test/matrices.mini b/dune/xt/la/test/matrices.mini index a0143ed1c..ca3e2df47 100644 --- a/dune/xt/la/test/matrices.mini +++ b/dune/xt/la/test/matrices.mini @@ -3,4 +3,4 @@ __local.matrix_eigen = EigenRowMajorSparseMatrix, EigenDenseMatrix | expand __local.matrix_istl = IstlRowMajorSparseMatrix matrix = {__local.matrix_common}, {__local.matrix_eigen}, {__local.matrix_istl} | expand types -1, EIGEN_FOUND, dune-istl_FOUND | expand types | cmake_guard +1, EIGEN3_FOUND, dune-istl_FOUND | expand types | cmake_guard diff --git a/dune/xt/la/test/solver.mini b/dune/xt/la/test/solver.mini index e6317348b..71bedb71d 100644 --- a/dune/xt/la/test/solver.mini +++ b/dune/xt/la/test/solver.mini @@ -8,6 +8,7 @@ __local.vector_eigen2 = EigenDenseVector, EigenMappedDenseVector | expand vector2 = {__local.vector_common}, {__local.vector_eigen2}, {__local.vector_istl} | expand types ('{vector}' == 'EigenMappedDenseVector' or '{vector2}' == 'EigenMappedDenseVector') and '{matrix}' == 'EigenRowMajorSparseMatrix' | exclude +'{vector2}' == 'EigenMappedDenseVector' and '{fieldtype_short}' == 'complex' | exclude '{matrix}' == 'CommonSparseMatrix' | exclude '{matrix}' == 'IstlRowMajorSparseMatrix' and '{fieldtype_short}' == 'complex' | exclude diff --git a/dune/xt/la/test/vectors.mini b/dune/xt/la/test/vectors.mini index b970a5235..2c3fe17fc 100644 --- a/dune/xt/la/test/vectors.mini +++ b/dune/xt/la/test/vectors.mini @@ -5,5 +5,6 @@ __local.vector_common = CommonDenseVector __local.vector_eigen = EigenDenseVector, EigenMappedDenseVector | expand __local.vector_istl = IstlDenseVector vector = {__local.vector_common}, {__local.vector_eigen}, {__local.vector_istl} | expand types +'{vector}' == 'EigenMappedDenseVector' and '{fieldtype_short}' == 'complex' | exclude -1, EIGEN_FOUND, dune-istl_FOUND | expand types | cmake_guard +1, EIGEN3_FOUND, dune-istl_FOUND | expand types | cmake_guard -- GitLab