]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add global options to complete the previous slepc patch
authoryoung <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 29 Oct 2011 13:49:21 +0000 (13:49 +0000)
committeryoung <young@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 29 Oct 2011 13:49:21 +0000 (13:49 +0000)
git-svn-id: https://svn.dealii.org/trunk@24688 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/common/Make.global_options.in
deal.II/source/Makefile

index d1f0ee15e39a1174423d73d73b65dbbf5dda497e..e5bc799f7210db477577d94d214d16dae3183a53 100644 (file)
@@ -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)
index 74a29f5df3998d48e88e2d2b6a1e77037b69d100..b787067e15d6be42284dd7883e33e850cbcade47 100644 (file)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.