From 060acc6eaeea830ccb42d9c6ce2f173385a68c76 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 4 Jan 2011 09:54:14 +0100 Subject: [PATCH] COMP: fix missing link references to FOAM_EXT_LIBBIN --- applications/utilities/mesh/conversion/Optional/Allwmake | 2 +- .../mesh/conversion/Optional/ccm26ToFoam/Make/options | 8 +++++--- .../dataConversion/foamToTecplot360/Make/options | 4 ++-- .../MGridGenGamgAgglomeration/Make/options | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake index 2791c1121e..25800377a1 100755 --- a/applications/utilities/mesh/conversion/Optional/Allwmake +++ b/applications/utilities/mesh/conversion/Optional/Allwmake @@ -9,7 +9,7 @@ set -x $WM_THIRD_PARTY_DIR/AllwmakeLibccmio # if the library built properly, the headers should exist too -if [ -e $FOAM_LIBBIN/libccmio.so ] +if [ -e $FOAM_EXT_LIBBIN/libccmio.so ] then wmake ccm26ToFoam fi diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options index e87c735e37..e2cdbcd1c2 100644 --- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options +++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options @@ -1,10 +1,12 @@ +LIBCCMIO_DIR = $(WM_THIRD_PARTY_DIR)/libccmio-2.6.1 + EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I${WM_THIRD_PARTY_DIR}/libccmio-2.6.1 \ - -I${WM_THIRD_PARTY_DIR}/libccmio-2.6.1/lnInclude + -I$(LIBCCMIO_DIR) \ + -I$(LIBCCMIO_DIR)/lnInclude EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lccmio + -L$(FOAM_EXT_LIBBIN) -lccmio diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options index c3569ababf..97a2251f7b 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options @@ -6,8 +6,8 @@ EXE_INC = \ EXE_LIBS = \ - -ltecio \ -llagrangian \ -lfiniteVolume \ -lgenericPatchFields \ - -lmeshTools + -lmeshTools \ + -L$(FOAM_EXT_LIBBIN) -ltecio diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options index 26c2b8abfb..80b3169750 100644 --- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options +++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options @@ -12,4 +12,4 @@ EXE_INC = \ $(TYPE_REAL) LIB_LIBS = \ - -lMGridGen + -L$(FOAM_EXT_LIBBIN) -lMGridGen