From: Matthias Maier Date: Sun, 11 Jan 2015 14:14:03 +0000 (+0100) Subject: CMake: Remove mumps configuration X-Git-Tag: v8.3.0-rc1~558^2~3 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32bebf670a4c240d6886963f174065df52cebcb3;p=dealii.git CMake: Remove mumps configuration --- diff --git a/cmake/config/CMakeLists.txt b/cmake/config/CMakeLists.txt index 1e99a4fe44..e457629e05 100644 --- a/cmake/config/CMakeLists.txt +++ b/cmake/config/CMakeLists.txt @@ -339,7 +339,6 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES) COND_SET_TO_YES(DEAL_II_WITH_LAPACK MAKEFILE_LAPACK) COND_SET_TO_YES(DEAL_II_WITH_METIS MAKEFILE_METIS) COND_SET_TO_YES(DEAL_II_WITH_MPI MAKEFILE_MPI) - COND_SET_TO_YES(DEAL_II_WITH_MUMPS MAKEFILE_MUMPS) COND_SET_TO_YES(DEAL_II_WITH_OPENCASCADE MAKEFILE_OPENCASCADE) COND_SET_TO_YES(DEAL_II_WITH_P4EST MAKEFILE_P4EST) COND_SET_TO_YES(DEAL_II_WITH_PETSC MAKEFILE_PETSC) diff --git a/cmake/config/Make.global_options.in b/cmake/config/Make.global_options.in index d1b98ce332..aa3290857b 100644 --- a/cmake/config/Make.global_options.in +++ b/cmake/config/Make.global_options.in @@ -57,7 +57,6 @@ USE_CONTRIB_TRILINOS = @MAKEFILE_TRILINOS@ USE_CONTRIB_HDF5 = @MAKEFILE_HDF5@ USE_CONTRIB_BLAS = @MAKEFILE_BLAS@ USE_CONTRIB_LAPACK = @MAKEFILE_LAPACK@ -USE_CONTRIB_MUMPS = @MAKEFILE_MUMPS@ USE_CONTRIB_ARPACK = @MAKEFILE_ARPACK@ USE_CONTRIB_METIS = @MAKEFILE_METIS@ USE_CONTRIB_UMFPACK = @MAKEFILE_UMFPACK@ diff --git a/cmake/configure/configure_mumps.cmake b/cmake/configure/configure_mumps.cmake deleted file mode 100644 index 441169610e..0000000000 --- a/cmake/configure/configure_mumps.cmake +++ /dev/null @@ -1,32 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2012 - 2014 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE at -## the top level of the deal.II distribution. -## -## --------------------------------------------------------------------- - -# -# Configuration for the MUMPS library: -# - -SET(FEATURE_MUMPS_DEPENDS MPI LAPACK) - - -MACRO(FEATURE_MUMPS_FIND_EXTERNAL var) - FIND_PACKAGE(MUMPS) - - IF(MUMPS_FOUND) - SET(${var} TRUE) - CHECK_MPI_INTERFACE(MUMPS ${var}) - ENDIF() -ENDMACRO() - -CONFIGURE_FEATURE(MUMPS) diff --git a/cmake/modules/FindMUMPS.cmake b/cmake/modules/FindMUMPS.cmake deleted file mode 100644 index 5aa4bc22ea..0000000000 --- a/cmake/modules/FindMUMPS.cmake +++ /dev/null @@ -1,123 +0,0 @@ -## --------------------------------------------------------------------- -## -## Copyright (C) 2012 - 2014 by the deal.II authors -## -## This file is part of the deal.II library. -## -## The deal.II library is free software; you can use it, redistribute -## it, and/or modify it under the terms of the GNU Lesser General -## Public License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## The full text of the license can be found in the file LICENSE at -## the top level of the deal.II distribution. -## -## --------------------------------------------------------------------- - -# -# Try to find the MUMPS library -# -# This module exports -# -# MUMPS_INCLUDE_DIRS -# MUMPS_LIBRARIES -# MUMPS_LINKER_FLAGS -# MUMPS_VERSION -# MUMPS_VERSION_MAJOR -# MUMPS_VERSION_MINOR -# MUMPS_VERSION_SUBMINOR -# - -SET(MUMPS_DIR "" CACHE PATH "An optional hint to a mumps directory") -SET(SCALAPACK_DIR "" CACHE PATH "An optional hint to a SCALAPACK directory") -SET(BLACS_DIR "" CACHE PATH "An optional hint to a BLACS directory") -SET_IF_EMPTY(MUMPS_DIR "$ENV{MUMPS_DIR}") -SET_IF_EMPTY(SCALAPACK_DIR "$ENV{SCALAPACK_DIR}") -SET_IF_EMPTY(BLACS_DIR "$ENV{BLACS_DIR}") - -# -# Search for scalapack: -# - -DEAL_II_FIND_LIBRARY(SCALAPACK_LIBRARY NAMES scalapack scalapack-openmpi - HINTS ${SCALAPACK_DIR} - PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib - ) - -# -# Well, depending on the version of scalapack and the distribution it might -# be necessary to search for blacs, too. So we do this in a very -# probabilistic way... -# -FOREACH(_lib blacs blacsCinit blacsF77init) - STRING(TOUPPER "${_lib}" _lib_upper) - DEAL_II_FIND_LIBRARY(${_lib_upper}_LIBRARY - NAMES ${_lib} ${_lib}_MPI-LINUX-0 ${_lib}_MPI-DARWIN-0 ${_lib}-openmpi - HINTS ${BLACS_DIR} ${SCALAPACK_DIR} ${SCALAPACK_DIR}/../blacs/ - PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib LIB - ) -ENDFOREACH() - -# -# Search for mumps: -# - -DEAL_II_FIND_PATH(MUMPS_INCLUDE_DIR dmumps_c.h - HINTS ${MUMPS_DIR} - PATH_SUFFIXES mumps include/mumps include - ) - -DEAL_II_FIND_LIBRARY(DMUMPS_LIBRARY - NAMES dmumps - HINTS ${MUMPS_DIR} - PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib - ) - -DEAL_II_FIND_LIBRARY(MUMPS_COMMON_LIBRARY - NAMES mumps_common - HINTS ${MUMPS_DIR} - PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib - ) - -# -# If we can find libport.so (or similiar), link it in as well: -# -DEAL_II_FIND_LIBRARY(PORD_LIBRARY - NAMES pord - HINTS ${MUMPS_DIR} - PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib - ) - -IF(EXISTS ${MUMPS_INCLUDE_DIR}/dmumps_c.h) - FILE(STRINGS "${MUMPS_INCLUDE_DIR}/dmumps_c.h" MUMPS_VERSION_STRING - REGEX "#define.*MUMPS_VERSION") - STRING(REGEX REPLACE "^.*MUMPS_VERSION.*\"(.+)\".*" "\\1" - MUMPS_VERSION "${MUMPS_VERSION_STRING}" - ) - STRING(REGEX REPLACE - "([0-9]+)\\..*" "\\1" MUMPS_VERSION_MAJOR "${MUMPS_VERSION}" - ) - STRING(REGEX REPLACE - "^[0-9]+\\.([0-9]+).*" "\\1" MUMPS_VERSION_MINOR "${MUMPS_VERSION}" - ) - STRING(REGEX REPLACE - "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" MUMPS_VERSION_SUBMINOR "${MUMPS_VERSION}" - ) -ENDIF() - -DEAL_II_PACKAGE_HANDLE(MUMPS - LIBRARIES - REQUIRED DMUMPS_LIBRARY MUMPS_COMMON_LIBRARY - OPTIONAL PORD_LIBRARY - REQUIRED SCALAPACK_LIBRARY LAPACK_LIBRARIES - OPTIONAL BLACS_LIBRARY BLACSCINIT_LIBRARY BLACSF77INIT_LIBRARY MPI_Fortran_LIBRARIES - OPTIONAL METIS_LIBRARIES MPI_Fortran_LIBRARIES - INCLUDE_DIRS - REQUIRED MUMPS_INCLUDE_DIR - USER_INCLUDE_DIRS - REQUIRED MUMPS_INCLUDE_DIR - LINKER_FLAGS - OPTIONAL LAPACK_LINKER_FLAGS - CLEAR - DMUMPS_LIBRARY MUMPS_COMMON_LIBRARY PORD_LIBRARY SCALAPACK_LIBRARY - BLACS_LIBRARY BLACSCINIT_LIBRARY BLACSF77INIT_LIBRARY MUMPS_INCLUDE_DIR - ) diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index 520d0c0f4b..df035a9087 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -308,17 +308,6 @@ #endif -/***************************************** - * Configured in configure_mumps.cmake: * - *****************************************/ - -#cmakedefine DEAL_II_WITH_MUMPS -#ifdef DEAL_II_WITH_MUMPS -/** Compatibility definition (with naming from deal.II < 8.0): */ -# define DEAL_II_USE_MUMPS -#endif - - /************************************************* * Configured in configure_functionparser.cmake: * *************************************************/