merge branch issue/cmake_backend_check into feature/cmake_packages

cmake/modules/AmdisMacros.cmake

@@ -4,20 +4,24 @@ include(AddAmdisExecutable)
 set(BACKEND "ISTL" CACHE STRING "LinearAlgebra backend. One of MTL, EIGEN, ISTL")
 set_property(CACHE BACKEND PROPERTY STRINGS "MTL" "EIGEN" "ISTL")
 
-if (BACKEND STREQUAL "MTL")
+if (BACKEND STREQUAL "MTL" OR BACKEND STREQUAL "MTL4")
   find_package(MTL REQUIRED)
   set(HAVE_MTL MTL_FOUND)
   if (MTL_FOUND)
     message(STATUS "  Found MTL, version: ${MTL_VERSION}")
     dune_register_package_flags(LIBRARIES MTL::MTL COMPILE_DEFINITIONS "ENABLE_MTL=1")
   endif (MTL_FOUND)
-elseif (BACKEND STREQUAL "EIGEN")
+elseif (BACKEND STREQUAL "EIGEN" OR BACKEND STREQUAL "EIGEN3")
   find_package(Eigen3 REQUIRED 3.3.5)
   set(HAVE_EIGEN EIGEN_FOUND)
   if (EIGEN3_FOUND)
     message(STATUS "  Found Eigen3, version: ${Eigen3_VERSION}")
     dune_register_package_flags(LIBRARIES Eigen3::Eigen COMPILE_DEFINITIONS "ENABLE_EIGEN=1")
   endif (EIGEN3_FOUND)
-elseif (NOT dune-istl_FOUND)
-  message(FATAL "Need dune-istl, MTL, or Eigen3 as linear algebra backend. Change flag BACKEND!")
+elseif (BACKEND STREQUAL "ISTL")
+  if (NOT dune-istl_FOUND)
+    message(FATAL_ERROR "Need dune-istl, MTL, or Eigen3 as linear algebra backend. Change flag BACKEND!")
+  endif ()
+else ()
+  message(FATAL_ERROR "BACKEND must be one of MTL, EIGEN, ISTL")
 endif ()

config.h.cmake

@@ -41,10 +41,10 @@
 #define AMDIS_VERSION_REVISION @AMDIS_VERSION_REVISION@
 
 /* Define to ENABLE_MTL if the MTL library is available */
-#cmakedefine HAVE_MTL ENABLE_MTL
+#cmakedefine HAVE_MTL 1
 
 /* Define to ENABLE_EIGEN if the Eigen3 library is available */
-#cmakedefine HAVE_EIGEN ENABLE_EIGEN
+#cmakedefine HAVE_EIGEN 1
 
 /* some detected compiler features may be used in AMDiS */
 #cmakedefine AMDIS_HAS_CXX_FOLD_EXPRESSIONS 1

src/amdis/DirichletBC.inc.hpp

@@ -7,8 +7,7 @@
 #include <dune/functions/functionspacebases/interpolate.hh>
 #include <dune/functions/functionspacebases/subspacebasis.hh>
 
-#include <amdis/Output.hpp>
-#include <amdis/linearalgebra/Constraints.hpp>
+#include <amdis/LinearAlgebra.hpp>
 
 namespace AMDiS {