From 07ce0a547ae0b99edc4cb5c7f19651e2bada283a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 28 Mar 2017 10:57:37 +0200
Subject: [PATCH] COMP: try harder to find/use zoltan library
---
.../mesh/manipulation/renumberMesh/Allwmake | 24 +++++++++++++++----
src/renumber/Allwmake | 13 ++++------
src/renumber/zoltanRenumber/Make/options | 5 +++-
3 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
index 4115f79c236..59db39f970d 100755
--- a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
@@ -12,11 +12,27 @@ then
export LINK_FLAGS="${LINK_FLAGS} -lSloanRenumber"
fi
-if [ -f "${ZOLTAN_ARCH_PATH}/lib/libzoltan.a" -a -f "${FOAM_LIBBIN}/libzoltanRenumber.so" ]
+if [ -f "${FOAM_LIBBIN}/libzoltanRenumber.so" ]
then
- echo " found libzoltanRenumber -- enabling sloan renumbering support."
- export COMP_FLAGS="-DFOAM_USE_ZOLTAN"
- export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L${ZOLTAN_ARCH_PATH}/lib -lzoltan"
+ if [ -z "$ZOLTAN_ARCH_PATH" ]
+ then
+ # Optional: get ZOLTAN_ARCH_PATH
+ if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan)
+ then
+ . $settings
+ fi
+ fi
+
+ for libdir in lib "lib${WM_COMPILER_LIB_ARCH}"
+ do
+ if [ -f "$ZOLTAN_ARCH_PATH/$libdir/libzoltan.a" ]
+ then
+ echo " found libzoltanRenumber -- enabling zoltan renumbering support."
+ export COMP_FLAGS="-DFOAM_USE_ZOLTAN"
+ export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L$ZOLTAN_ARCH_PATH/$libdir -lzoltan"
+ break
+ fi
+ done
fi
wmake $targetType
diff --git a/src/renumber/Allwmake b/src/renumber/Allwmake
index e1fcc89e662..aef86c64506 100755
--- a/src/renumber/Allwmake
+++ b/src/renumber/Allwmake
@@ -5,14 +5,11 @@ cd ${0%/*} || exit 1 # Run from this directory
targetType=libso
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-## Get ZOLTAN_ARCH_PATH
-#if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan)
-#then
-# . $settings
-# echo "using ZOLTAN_ARCH_PATH=$ZOLTAN_ARCH_PATH"
-#else
-# echo "Error: no config.sh/zoltan settings"
-#fi
+# Optional: get ZOLTAN_ARCH_PATH
+if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan)
+then
+ . $settings
+fi
wmake $targetType renumberMethods
diff --git a/src/renumber/zoltanRenumber/Make/options b/src/renumber/zoltanRenumber/Make/options
index c637f39ba96..ed93f8b2b87 100644
--- a/src/renumber/zoltanRenumber/Make/options
+++ b/src/renumber/zoltanRenumber/Make/options
@@ -4,10 +4,13 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
EXE_INC = \
/* -DFULLDEBUG -g -O0 */ \
$(PFLAGS) $(PINC) \
+ ${c++LESSWARN} \
-I$(FOAM_SRC)/renumber/renumberMethods/lnInclude \
-I$(ZOLTAN_ARCH_PATH)/include/ \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
- /* -L$(ZOLTAN_ARCH_PATH)/lib -lzoltan */ \
+ -L$(ZOLTAN_ARCH_PATH)/lib \
+ -L$(ZOLTAN_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
+ -lzoltan \
-lmeshTools
--
GitLab