From d06cede83385f543ac1216b8ae876b1965695585 Mon Sep 17 00:00:00 2001 From: young Date: Sat, 29 Oct 2011 13:49:21 +0000 Subject: [PATCH] Add global options to complete the previous slepc patch git-svn-id: https://svn.dealii.org/trunk@24688 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/common/Make.global_options.in | 18 ++++++++---------- deal.II/source/Makefile | 12 ++++++++---- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index d1f0ee15e3..e5bc799f72 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -277,11 +277,9 @@ ifeq ($(DEAL_II_PETSC_VERSION_MAJOR),2) else include-path-petsc-bmake = $(DEAL_II_PETSC_DIR)/$(DEAL_II_PETSC_ARCH)/include endif -include-path-slepc = $(DEAL_II_SLEPC_DIR)/include +include-path-slepc = $(DEAL_II_SLEPC_DIR)/include +include-path-slepc-bmake = $(DEAL_II_SLEPC_DIR)/$(DEAL_II_PETSC_ARCH)/include include-path-slepc-conf = $(DEAL_II_SLEPC_DIR)/$(DEAL_II_PETSC_ARCH)/conf -ifeq ($(DEAL_II_PETSC_VERSION_DEV),yes) - include-path-slepc-include = $(DEAL_II_SLEPC_DIR)/$(DEAL_II_PETSC_ARCH)/include -endif include-path-trilinos = $(DEAL_II_TRILINOS_INCDIR) include-path-mumps = $(DEAL_II_MUMPS_DIR)/include @@ -309,15 +307,15 @@ ifeq ($(USE_CONTRIB_PETSC),yes) ifeq ($(DEAL_II_PETSC_VERSION_MAJOR)$(DEAL_II_PETSC_VERSION_MINOR),22) include $(DEAL_II_PETSC_DIR)/bmake/$(DEAL_II_PETSC_ARCH)/packages endif - INCLUDE += -I$(include-path-petsc) -I$(include-path-petsc-bmake)\ - $(MPI_INCLUDE) + INCLUDE += -I$(include-path-petsc) \ + -I$(include-path-petsc-bmake) \ + $(MPI_INCLUDE) endif ifeq ($(USE_CONTRIB_SLEPC),yes) - INCLUDE += -I$(include-path-slepc) -I$(include-path-slepc-conf) -ifeq ($(DEAL_II_PETSC_VERSION_DEV),yes) - INCLUDE += -I$(include-path-slepc-include) -endif + INCLUDE += -I$(include-path-slepc) \ + -I$(include-path-slepc-bmake) \ + -I$(include-path-slepc-conf) endif ifeq ($(USE_CONTRIB_TRILINOS),yes) diff --git a/deal.II/source/Makefile b/deal.II/source/Makefile index 74a29f5df3..b787067e15 100644 --- a/deal.II/source/Makefile +++ b/deal.II/source/Makefile @@ -86,14 +86,18 @@ ifneq ($(GXX-VERSION),compaq_cxx) # same with PETSC ifeq ($(USE_CONTRIB_PETSC),yes) - deplibs.g += $(lib-contrib-petsc.g) - deplibs.o += $(lib-contrib-petsc.o) + deplibs.g += $(lib-contrib-petsc.g) \ + $(call DEAL_II_RPATH,$(DEAL_II_PETSC_LIBDIR)) + deplibs.o += $(lib-contrib-petsc.o) \ + $(call DEAL_II_RPATH,$(DEAL_II_PETSC_LIBDIR)) endif # same with SLEPC ifeq ($(USE_CONTRIB_SLEPC),yes) - deplibs.g += $(lib-contrib-slepc) - deplibs.o += $(lib-contrib-slepc) + deplibs.g += $(lib-contrib-slepc) \ + $(call DEAL_II_RPATH,$(DEAL_II_SLEPC_LIBDIR)) + deplibs.o += $(lib-contrib-slepc) \ + $(call DEAL_II_RPATH,$(DEAL_II_SLEPC_LIBDIR)) endif # same with TRILINOS -- 2.39.5