]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Link with Trilinos libs when necessary.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 4 Mar 2008 21:08:20 +0000 (21:08 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 4 Mar 2008 21:08:20 +0000 (21:08 +0000)
git-svn-id: https://svn.dealii.org/trunk@15848 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/common/Make.global_options.in

index 8a882dbb273038c29f9c3f6c98e54b1392eac37f..941acb199c8e5b17c1035aa924af79dde74ce70f 100644 (file)
@@ -199,6 +199,15 @@ endif
 
 ifeq ($(USE_CONTRIB_TRILINOS),yes)
   INCLUDE += -I$(include-path-trilinos)
+
+  ifeq ($(enable-shared),yes)
+    lib-contrib-trilinos = $(shell echo $(DEAL_II_TRILINOS_DIR)/lib/*$(shared-lib-suffix))
+  else
+    lib-contrib-trilinos = $(shell echo $(DEAL_II_TRILINOS_DIR)/lib/*$(static-lib-suffix))
+  endif
+
+  lib-lac.g += $(lib-contrib-trilinos)
+  lib-lac.o += $(lib-contrib-trilinos)
 endif
 
 ifeq ($(USE_CONTRIB_METIS),yes)

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.