From 2ae3518b8cc9e3bb2d8af0206ba1fb9a8acdb01e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 18 Jun 2020 22:53:32 +0200
Subject: [PATCH] COMP: handle multiple include or library directories (#3)
- might have PREFIX/ARCH/include PREFIX/include
---
src/petsc4Foam/Allwmake | 11 +++++++----
src/petsc4Foam/Make/options | 7 +++----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/petsc4Foam/Allwmake b/src/petsc4Foam/Allwmake
index c07c393..b718bd8 100755
--- a/src/petsc4Foam/Allwmake
+++ b/src/petsc4Foam/Allwmake
@@ -11,16 +11,19 @@ then
echo "wmake(petsc) $targetType : $PETSC_ARCH_PATH"
wmake $targetType
- /bin/cat<<INFO 1>&2
+ /bin/cat<<INFORMATION 1>&2
==> Before running, verify that PETSc libraries can be found
+For example,
-Enable in the OpenFOAM etc/bashrc, define manually or try with the
-following (POSIX shell):
+ foamHasLibrary -verbose petscFoam
+
+Define manually, enable in OpenFOAM etc/bashrc, or try the following [POSIX]:
eval \$(foamEtcFile -sh -config petsc -- -force)
==
-INFO
+INFORMATION
+
fi
#------------------------------------------------------------------------------
diff --git a/src/petsc4Foam/Make/options b/src/petsc4Foam/Make/options
index f499183..a4d0a73 100644
--- a/src/petsc4Foam/Make/options
+++ b/src/petsc4Foam/Make/options
@@ -12,11 +12,10 @@ EXE_INC = \
$(PFLAGS) $(PINC) \
-Wno-old-style-cast \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/fvOptions/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I${PETSC_INC_DIR}
+ $(foreach dir,$(PETSC_INC_DIR),-I$(dir))
LIB_LIBS = \
-lfiniteVolume \
- -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) \
- -L${PETSC_LIB_DIR} -lpetsc
+ -lmeshTools \
+ $(foreach dir,$(PETSC_LIB_DIR),-L$(dir)) -lpetsc
--
GitLab