Merge pull request #579 from mmuetzel/umfpack

Make building with UMFPACK optional.

CMakeLists.txt

@@ -81,6 +81,7 @@ SET(WITH_MKL FALSE CACHE BOOL "Use Intel Math Kernel library")
 SET(WITH_Mumps FALSE CACHE BOOL "Use Mumps sparse direct solver")
 SET(WITH_Hypre FALSE CACHE BOOL "Use Hypre linear algebra library")
 SET(WITH_CHOLMOD FALSE CACHE BOOL "Use CHOLMOD linear algebra library")
+SET(WITH_UMFPACK TRUE CACHE BOOL "Use UMFPACK for LU factorization")
 SET(WITH_ELMERGUI FALSE CACHE BOOL "Include ElmerGUI")
 SET(WITH_ElmerIce FALSE CACHE BOOL "Include ElmerIce")
 SET(WITH_XIOS FALSE CACHE BOOL "Include XIOS")
@@ -626,29 +627,35 @@ IF(WITH_ElmerIce)
   ADD_SUBDIRECTORY(elmerice)
 ENDIF(WITH_ElmerIce)
 
-IF (EXTERNAL_UMFPACK)
-  MESSAGE(STATUS "Using external UMFPACK instead of built-in")
-  FIND_PACKAGE(UMFPACK REQUIRED)
-
-  # Check for size of "SuiteSparse_long"
-  INCLUDE(CheckTypeSize)
-  SET(old_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
-  SET(old_CMAKE_EXTRA_INCLUDE_FILES ${CMAKE_EXTRA_INCLUDE_FILES})
-  LIST(APPEND CMAKE_REQUIRED_INCLUDES "${UMFPACK_INCLUDE_DIR}")
-  LIST(APPEND CMAKE_EXTRA_INCLUDE_FILES "umfpack.h")
-  CHECK_TYPE_SIZE("SuiteSparse_long" SIZEOF_SUITESPARSE_LONG LANGUAGE C)
-  SET(CMAKE_REQUIRED_INCLUDES ${old_CMAKE_REQUIRED_INCLUDES})
-  SET(CMAKE_EXTRA_INCLUDE_FILES ${old_CMAKE_EXTRA_INCLUDE_FILES})
-  IF (HAVE_SIZEOF_SUITESPARSE_LONG)
-    IF (SIZEOF_SUITESPARSE_LONG EQUAL 4)
-      SET(UMFPACK_LONG_FORTRAN_TYPE "C_INT32_T")
-    ELSE()
-      SET(UMFPACK_LONG_FORTRAN_TYPE "C_INT64_T")
+IF (WITH_UMFPACK)
+  IF (EXTERNAL_UMFPACK)
+    MESSAGE(STATUS "Using external UMFPACK instead of built-in")
+    FIND_PACKAGE(UMFPACK REQUIRED)
+
+    # Check for size of "SuiteSparse_long"
+    INCLUDE(CheckTypeSize)
+    SET(old_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
+    SET(old_CMAKE_EXTRA_INCLUDE_FILES ${CMAKE_EXTRA_INCLUDE_FILES})
+    LIST(APPEND CMAKE_REQUIRED_INCLUDES "${UMFPACK_INCLUDE_DIR}")
+    LIST(APPEND CMAKE_EXTRA_INCLUDE_FILES "umfpack.h")
+    CHECK_TYPE_SIZE("SuiteSparse_long" SIZEOF_SUITESPARSE_LONG LANGUAGE C)
+    SET(CMAKE_REQUIRED_INCLUDES ${old_CMAKE_REQUIRED_INCLUDES})
+    SET(CMAKE_EXTRA_INCLUDE_FILES ${old_CMAKE_EXTRA_INCLUDE_FILES})
+    IF (HAVE_SIZEOF_SUITESPARSE_LONG)
+      IF (SIZEOF_SUITESPARSE_LONG EQUAL 4)
+        SET(UMFPACK_LONG_FORTRAN_TYPE "C_INT32_T")
+      ELSE()
+        SET(UMFPACK_LONG_FORTRAN_TYPE "C_INT64_T")
+      ENDIF()
     ENDIF()
+  ELSE()
+    MESSAGE(STATUS "Using built-in UMFPACK")
+    ADD_SUBDIRECTORY(umfpack)
   ENDIF()
+  SET(HAVE_UMFPACK ON)
+  MARK_AS_ADVANCED(HAVE_UMFPACK)
 ELSE()
-  MESSAGE(STATUS "Using built-in UMFPACK")
-  ADD_SUBDIRECTORY(umfpack)
+  MESSAGE(STATUS "Building without UMFPACK")
 ENDIF()
 IF(NOT DEFINED UMFPACK_LONG_FORTRAN_TYPE)
   # Old versions of UMFPACK before "SuiteSparse_long" was defined used "long"
@@ -708,13 +715,16 @@ MESSAGE(STATUS "------------------------------------------------")
 MESSAGE(STATUS "  BLAS library:   " "${BLAS_LIBRARIES}")
 MESSAGE(STATUS "  LAPACK library: " "${LAPACK_LIBRARIES}")
 MESSAGE(STATUS "------------------------------------------------")
-IF(UMFPACK_FOUND)
-  MESSAGE(STATUS " UMFPACK library: " "${UMFPACK_LIBRARIES}")
-  MESSAGE(STATUS " UMFPACK headers: " "${UMFPACK_INCLUDE_DIR}")
-  MARK_AS_ADVANCED(HAVE_UMFPACK)
-  MESSAGE(STATUS "------------------------------------------------")
+IF(WITH_UMFPACK)
+  IF(UMFPACK_FOUND)
+    MESSAGE(STATUS " UMFPACK library: " "${UMFPACK_LIBRARIES}")
+    MESSAGE(STATUS " UMFPACK headers: " "${UMFPACK_INCLUDE_DIR}")
+    MESSAGE(STATUS "------------------------------------------------")
+  ELSE()
+    MESSAGE(STATUS " UMFPACK library: Using internal Elmer library")
+  ENDIF()
 ELSE()
-  MESSAGE(STATUS " UMFPACK library: Using internal Elmer library")
+  MESSAGE(STATUS " UMFPACK library: Building without UMFPACK")
 ENDIF()
 IF(CHOLMOD_FOUND AND SPQR_FOUND)
   MESSAGE(STATUS " CHOLMOD library: " "${CHOLMOD_LIBRARIES}")
@@ -825,6 +835,10 @@ IF(HAVE_EXTOPTIM)
   MESSAGE(STATUS "------------------------------------------------")
 ENDIF(HAVE_EXTOPTIM)
 
+IF(NOT HAVE_UMFPACK AND NOT HAVE_MUMPS)
+  MESSAGE(WARNING "Elmer is configured without backend for direct solvers (UMFPACK or MUMPS).\n"
+                  "Are you sure this is intended?")
+ENDIF()
 
 
 # Packaging

elmerice/Tests/AIFlowSolve/CMakeLists.txt

@@ -1,13 +1,15 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(AIFlow.sif AIFlow.sif COPYONLY)
+  CONFIGURE_FILE(AIFlow.sif AIFlow.sif COPYONLY)
 
-SET(FILE_LISTS ${CMAKE_SOURCE_DIR}/elmerice/Solvers/AIFlowSolve_nlS2.F90)
-ADD_ELMERICETEST_MODULE(AIFlowSolve  AIFlowSolveS2 "${FILE_LISTS}")
+  SET(FILE_LISTS ${CMAKE_SOURCE_DIR}/elmerice/Solvers/AIFlowSolve_nlS2.F90)
+  ADD_ELMERICETEST_MODULE(AIFlowSolve  AIFlowSolveS2 "${FILE_LISTS}")
 
-TARGET_LINK_LIBRARIES(AIFlowSolve_AIFlowSolveS2 ElmerIceSolvers)
+  TARGET_LINK_LIBRARIES(AIFlowSolve_AIFlowSolveS2 ElmerIceSolvers)
 
-FILE(COPY ELMERSOLVER_STARTINFO README.txt domec DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO README.txt domec DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(AIFlowSolve)
-ADD_ELMERICE_LABEL(AIFlowSolve elmerice-fast)
+  ADD_ELMERICE_TEST(AIFlowSolve)
+  ADD_ELMERICE_LABEL(AIFlowSolve elmerice-fast)
+ENDIF()

elmerice/Tests/BackgroundError/CMakeLists.txt

@@ -1,9 +1,11 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(case.sif case.sif COPYONLY)
+  CONFIGURE_FILE(case.sif case.sif COPYONLY)
 
-FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(BackgroundError)
-ADD_ELMERICE_LABEL(BackgroundError elmerice-fast)
-ADD_ELMERICE_LABEL(BackgroundError CovUtils)
+  ADD_ELMERICE_TEST(BackgroundError)
+  ADD_ELMERICE_LABEL(BackgroundError elmerice-fast)
+  ADD_ELMERICE_LABEL(BackgroundError CovUtils)
+ENDIF()

elmerice/Tests/Buoyancy/CMakeLists.txt

@@ -1,8 +1,10 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(buoyancy.sif buoyancy.sif COPYONLY)
+  CONFIGURE_FILE(buoyancy.sif buoyancy.sif COPYONLY)
 
-FILE(COPY ELMERSOLVER_STARTINFO README.txt mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO README.txt mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(Buoyancy)
-ADD_ELMERICE_LABEL(Buoyancy elmerice-fast)
+  ADD_ELMERICE_TEST(Buoyancy)
+  ADD_ELMERICE_LABEL(Buoyancy elmerice-fast)
+ENDIF()

elmerice/Tests/Calving2D/CMakeLists.txt

@@ -1,12 +1,14 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(calving2d.sif calving2d.sif COPYONLY)
+  CONFIGURE_FILE(calving2d.sif calving2d.sif COPYONLY)
 
-ADD_ELMERICETEST_MODULE(Calving2D bedrockfunction_flat ./PROG/bedrockfunction_flat.f90)
+  ADD_ELMERICETEST_MODULE(Calving2D bedrockfunction_flat ./PROG/bedrockfunction_flat.f90)
 
-FILE(COPY ELMERSOLVER_STARTINFO block_helheim.msh PROG DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO block_helheim.msh PROG DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Results/block_helheim")
+  FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Results/block_helheim")
 
-ADD_ELMERICE_TEST(Calving2D)
-ADD_ELMERICE_LABEL(Calving2D slow)
+  ADD_ELMERICE_TEST(Calving2D)
+  ADD_ELMERICE_LABEL(Calving2D slow)
+ENDIF()

elmerice/Tests/Calving3D_lset/CMakeLists.txt

@@ -20,8 +20,7 @@ IF(HAVE_MMG AND HAVE_ZOLTAN)
     IF(${NPROCS} GREATER ${MPI_TEST_MAXPROC} OR ${NPROCS} LESS ${MPI_TEST_MINPROC})
       MESSAGE(STATUS "Skipping test Calving3D_lset with ${NPROCS} procs")
     ELSE()
-      ADD_ELMERICE_TEST(Calving3D_lset)
-      ADD_ELMERICE_LABEL(Calving3D_lset slow)
+      ADD_ELMERICE_TEST(Calving3D_lset LABELS slow)
     ENDIF()
   ENDIF()
 

elmerice/Tests/ComputeDevStress/CMakeLists.txt

@@ -1,8 +1,10 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(computeDevStress.sif computeDevStress.sif COPYONLY)
+  CONFIGURE_FILE(computeDevStress.sif computeDevStress.sif COPYONLY)
 
-FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(ComputeDevStress)
-ADD_ELMERICE_LABEL(ComputeDevStress elmerice-fast)
+  ADD_ELMERICE_TEST(ComputeDevStress)
+  ADD_ELMERICE_LABEL(ComputeDevStress elmerice-fast)
+ENDIF()

elmerice/Tests/Contact/CMakeLists.txt

@@ -1,7 +1,9 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(cavity.sif cavity.sif COPYONLY)
+  CONFIGURE_FILE(cavity.sif cavity.sif COPYONLY)
 
-FILE(COPY ELMERSOLVER_STARTINFO ice.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO ice.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(Contact)
+  ADD_ELMERICE_TEST(Contact)
+ENDIF()

elmerice/Tests/CovarianceVector/CMakeLists.txt

@@ -1,13 +1,14 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
+  CONFIGURE_FILE(case.sif case.sif COPYONLY)
+  CONFIGURE_FILE(Init.F90 Init.F90 COPYONLY)
 
-CONFIGURE_FILE(case.sif case.sif COPYONLY)
-CONFIGURE_FILE(Init.F90 Init.F90 COPYONLY)
+  FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  ADD_ELMERICETEST_MODULE(CovarianceVector Init ./Init.F90)
 
-ADD_ELMERICETEST_MODULE(CovarianceVector Init ./Init.F90)
-
-ADD_ELMERICE_TEST(CovarianceVector)
-ADD_ELMERICE_LABEL(CovarianceVector elmerice-fast)
-ADD_ELMERICE_LABEL(CovarianceVector CovUtils)
+  ADD_ELMERICE_TEST(CovarianceVector)
+  ADD_ELMERICE_LABEL(CovarianceVector elmerice-fast)
+  ADD_ELMERICE_LABEL(CovarianceVector CovUtils)
+ENDIF()

elmerice/Tests/CovarianceVector2/CMakeLists.txt

@@ -1,13 +1,14 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
+  CONFIGURE_FILE(case.sif case.sif COPYONLY)
+  CONFIGURE_FILE(Init.F90 Init.F90 COPYONLY)
 
-CONFIGURE_FILE(case.sif case.sif COPYONLY)
-CONFIGURE_FILE(Init.F90 Init.F90 COPYONLY)
+  FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-FILE(COPY ELMERSOLVER_STARTINFO rectangle.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  ADD_ELMERICETEST_MODULE(CovarianceVector2 Init ./Init.F90)
 
-ADD_ELMERICETEST_MODULE(CovarianceVector2 Init ./Init.F90)
-
-ADD_ELMERICE_TEST(CovarianceVector2)
-ADD_ELMERICE_LABEL(CovarianceVector2 elmerice-fast)
-ADD_ELMERICE_LABEL(CovarianceVector2 CovUtils)
+  ADD_ELMERICE_TEST(CovarianceVector2)
+  ADD_ELMERICE_LABEL(CovarianceVector2 elmerice-fast)
+  ADD_ELMERICE_LABEL(CovarianceVector2 CovUtils)
+ENDIF()

elmerice/Tests/Damage/CMakeLists.txt

@@ -1,9 +1,11 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(damage.sif damage.sif COPYONLY)
+  CONFIGURE_FILE(damage.sif damage.sif COPYONLY)
 
-FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(Damage)
-ADD_ELMERICE_LABEL(Damage elmerice-long)
-ADD_ELMERICE_LABEL(Damage slow)
+  ADD_ELMERICE_TEST(Damage)
+  ADD_ELMERICE_LABEL(Damage elmerice-long)
+  ADD_ELMERICE_LABEL(Damage slow)
+ENDIF()

elmerice/Tests/EigenValues/CMakeLists.txt

@@ -1,8 +1,10 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(carre2D.sif carre2D.sif COPYONLY)
+  CONFIGURE_FILE(carre2D.sif carre2D.sif COPYONLY)
 
-FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(EigenValues)
-ADD_ELMERICE_LABEL(EigenValues elmerice-fast)
+  ADD_ELMERICE_TEST(EigenValues)
+  ADD_ELMERICE_LABEL(EigenValues elmerice-fast)
+ENDIF()

elmerice/Tests/Emergence/CMakeLists.txt

@@ -1,9 +1,11 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(emergencevelocity_restart.sif emergencevelocity_restart.sif COPYONLY)
+  CONFIGURE_FILE(emergencevelocity_restart.sif emergencevelocity_restart.sif COPYONLY)
 
-ADD_ELMERICETEST_MODULE(Emergence buelerprofile buelerprofile.f90)
-FILE(COPY ELMERSOLVER_STARTINFO buelerprofile.f90 footprint_bueler_f DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  ADD_ELMERICETEST_MODULE(Emergence buelerprofile buelerprofile.f90)
+  FILE(COPY ELMERSOLVER_STARTINFO buelerprofile.f90 footprint_bueler_f DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(Emergence)
-ADD_ELMERICE_LABEL(Emergence elmerice-fast)
+  ADD_ELMERICE_TEST(Emergence)
+  ADD_ELMERICE_LABEL(Emergence elmerice-fast)
+ENDIF()

elmerice/Tests/Enthalpy/CMakeLists.txt

@@ -1,9 +1,11 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(enthalpy.sif enthalpy.sif COPYONLY)
+  CONFIGURE_FILE(enthalpy.sif enthalpy.sif COPYONLY)
 
-FILE(COPY ELMERSOLVER_STARTINFO WithOutCavity DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO WithOutCavity DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(Enthalpy)
-ADD_ELMERICE_LABEL(Enthalpy elmerice-long)
-ADD_ELMERICE_LABEL(Enthalpy slow)
+  ADD_ELMERICE_TEST(Enthalpy)
+  ADD_ELMERICE_LABEL(Enthalpy elmerice-long)
+  ADD_ELMERICE_LABEL(Enthalpy slow)
+ENDIF()

elmerice/Tests/ExportVertically/CMakeLists.txt

@@ -1,8 +1,10 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(exportvertically.sif exportvertically.sif COPYONLY)
+  CONFIGURE_FILE(exportvertically.sif exportvertically.sif COPYONLY)
 
-FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO mesh.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(ExportVertically)
-ADD_ELMERICE_LABEL(ExportVertically elmerice-fast)
+  ADD_ELMERICE_TEST(ExportVertically)
+  ADD_ELMERICE_LABEL(ExportVertically elmerice-fast)
+ENDIF()

elmerice/Tests/ForceToStress/CMakeLists.txt

@@ -1,8 +1,10 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(test.sif test.sif COPYONLY)
+  CONFIGURE_FILE(test.sif test.sif COPYONLY)
 
-FILE(COPY ELMERSOLVER_STARTINFO cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(ForceToStress)
-ADD_ELMERICE_LABEL(ForceToStress elmerice-fast)
+  ADD_ELMERICE_TEST(ForceToStress)
+  ADD_ELMERICE_LABEL(ForceToStress elmerice-fast)
+ENDIF()

elmerice/Tests/ForceToStress_periodic/CMakeLists.txt

@@ -1,8 +1,10 @@
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
+IF(HAVE_UMFPACK OR HAVE_MUMPS)
+  INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../test_macros.cmake)
 
-CONFIGURE_FILE(test.sif test.sif COPYONLY)
+  CONFIGURE_FILE(test.sif test.sif COPYONLY)
 
-FILE(COPY ELMERSOLVER_STARTINFO cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
+  FILE(COPY ELMERSOLVER_STARTINFO cube.grd DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
 
-ADD_ELMERICE_TEST(ForceToStress_periodic)
-ADD_ELMERICE_LABEL(ForceToStress_periodic elmerice-fast)
+  ADD_ELMERICE_TEST(ForceToStress_periodic)
+  ADD_ELMERICE_LABEL(ForceToStress_periodic elmerice-fast)
+ENDIF()