Skip to content
Snippets Groups Projects
Commit 399df1a2 authored by Mark Olesen's avatar Mark Olesen
Browse files

ENH: also accept 'lib' for metis and scotch libraries

- this corresponds to what various module or build systems provide.
  ThirdParty builds are unaffected since they install into FOAM_EXT_LIBBIN
parent 2853678a
No related merge requests found
...@@ -36,6 +36,7 @@ hasMetis() ...@@ -36,6 +36,7 @@ hasMetis()
# Library # Library
[ -r $FOAM_EXT_LIBBIN/libmetis.so ] || \ [ -r $FOAM_EXT_LIBBIN/libmetis.so ] || \
[ -r $METIS_ARCH_PATH/lib/libmetis.so ] || \
[ -r $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.so ] || \ [ -r $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.so ] || \
[ "${METIS_ARCH_PATH##*-}" = system ] || { [ "${METIS_ARCH_PATH##*-}" = system ] || {
echo "$warning (missing library)" echo "$warning (missing library)"
...@@ -90,6 +91,7 @@ hasScotch() ...@@ -90,6 +91,7 @@ hasScotch()
# Library # Library
[ -r $FOAM_EXT_LIBBIN/libscotch.so ] || \ [ -r $FOAM_EXT_LIBBIN/libscotch.so ] || \
[ -r $SCOTCH_ARCH_PATH/lib/libscotch.so ] || \
[ -r $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.so ] || \ [ -r $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.so ] || \
[ "${SCOTCH_ARCH_PATH##*-}" = system ] || { [ "${SCOTCH_ARCH_PATH##*-}" = system ] || {
echo "$warning (missing library)" echo "$warning (missing library)"
......
...@@ -8,6 +8,7 @@ EXE_INC = \ ...@@ -8,6 +8,7 @@ EXE_INC = \
* to support central, non-thirdparty installations * to support central, non-thirdparty installations
*/ */
LIB_LIBS = \ LIB_LIBS = \
-L$(METIS_ARCH_PATH)/lib \
-L$(METIS_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ -L$(METIS_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-L$(FOAM_EXT_LIBBIN) \ -L$(FOAM_EXT_LIBBIN) \
-lmetis -lmetis
...@@ -16,6 +16,7 @@ EXE_INC = \ ...@@ -16,6 +16,7 @@ EXE_INC = \
* to support central, non-thirdparty installations * to support central, non-thirdparty installations
*/ */
LIB_LIBS = \ LIB_LIBS = \
-L$(SCOTCH_ARCH_PATH)/lib \
-L$(SCOTCH_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ -L$(SCOTCH_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-L$(FOAM_EXT_LIBBIN) \ -L$(FOAM_EXT_LIBBIN) \
-L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) \ -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) \
......
...@@ -16,6 +16,7 @@ EXE_INC = \ ...@@ -16,6 +16,7 @@ EXE_INC = \
* to support central, non-thirdparty installations * to support central, non-thirdparty installations
*/ */
LIB_LIBS = \ LIB_LIBS = \
-L$(SCOTCH_ARCH_PATH)/lib \
-L$(SCOTCH_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ -L$(SCOTCH_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
-L$(FOAM_EXT_LIBBIN) \ -L$(FOAM_EXT_LIBBIN) \
-lscotch \ -lscotch \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment