From 5b857714beab3edf48062f2a8999f27cd0b1d111 Mon Sep 17 00:00:00 2001 From: young Date: Mon, 13 Aug 2012 13:43:22 +0000 Subject: [PATCH] Make METIS configure output more verbose git-svn-id: https://svn.dealii.org/trunk@25932 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/common/Make.global_options.in | 9 ++++++++- deal.II/configure.in | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 80928d3ba8..a2343dd289 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -90,7 +90,9 @@ DEAL_II_ARPACK_DIR = @DEAL_II_ARPACK_DIR@ DEAL_II_ARPACK_ARCH = @DEAL_II_ARPACK_ARCH@ USE_CONTRIB_METIS = @USE_CONTRIB_METIS@ +DEAL_II_METIS_DIR = @DEAL_II_METIS_DIR@ DEAL_II_METIS_LIBDIR = @DEAL_II_METIS_LIBDIR@ +DEAL_II_METIS_INCDIR = @DEAL_II_METIS_INCDIR@ USE_CONTRIB_HSL = @USE_CONTRIB_HSL@ USE_CONTRIB_UMFPACK = @USE_CONTRIB_UMFPACK@ @@ -200,7 +202,7 @@ endif # same for metis, except that there is only one library in that case ifeq ($(USE_CONTRIB_METIS),yes) - lib-contrib-metis = $(DEAL_II_METIS_LIBDIR)/libmetis.a + lib-contrib-metis = $(DEAL_II_METIS_LIBDIR)/libmetis$(lib-suffix) endif # List all trilinos libraries that we want to link with. These must be sorted @@ -283,6 +285,7 @@ include-path-slepc-bmake = $(DEAL_II_SLEPC_DIR)/$(DEAL_II_PETSC_ARCH)/includ include-path-slepc-conf = $(DEAL_II_SLEPC_DIR)/$(DEAL_II_PETSC_ARCH)/conf include-path-trilinos = $(DEAL_II_TRILINOS_INCDIR) include-path-mumps = $(DEAL_II_MUMPS_DIR)/include +include-path-metis = $(DEAL_II_METIS_INCDIR) # include paths as command line flags. while compilers allow a space between # the '-I' and the actual path, we also send these flags to the @@ -327,6 +330,10 @@ ifeq ($(USE_CONTRIB_MUMPS),yes) INCLUDE += -I$(include-path-mumps) endif +ifeq ($(USE_CONTRIB_METIS),yes) + INCLUDE += -I$(include-path-metis) +endif + ifeq ($(enable-threads),yes) INCLUDE += -I$(shell echo $D/contrib/tbb/tbb*/include) endif diff --git a/deal.II/configure.in b/deal.II/configure.in index 747709fe0e..b0dd66d93d 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -650,7 +650,9 @@ DEAL_II_CONFIGURE_NETCDF DEAL_II_CONFIGURE_METIS AC_SUBST(USE_CONTRIB_METIS) +AC_SUBST(DEAL_II_METIS_DIR) AC_SUBST(DEAL_II_METIS_LIBDIR) +AC_SUBST(DEAL_II_METIS_INCDIR) dnl Check for UMFPack DEAL_II_WITH_UMFPACK -- 2.39.5