From 23d46a1bc7c2b1fe854549f37c8357e3f00478d7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 29 Apr 2019 19:06:56 +0200
Subject: [PATCH] COMP: correct the linkage options
---
executables/cartesian2DMesh/Make/options | 3 ++-
executables/cartesianMesh/Make/options | 3 ++-
executables/pMesh/Make/options | 3 ++-
executables/tetMesh/Make/options | 3 ++-
meshLibrary/Make/options | 4 +++-
utilities/FLMAToSurface/Make/options | 4 +++-
utilities/mergeSurfacePatches/Make/options | 4 +++-
utilities/preparePar/Make/options | 3 ++-
utilities/subsetToPatch/Make/options | 4 +++-
utilities/surfaceGenerateBoundingBox/Make/options | 4 +++-
utilities/surfaceToFMS/Make/options | 3 ++-
11 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/executables/cartesian2DMesh/Make/options b/executables/cartesian2DMesh/Make/options
index 267dbcc3..cf583700 100644
--- a/executables/cartesian2DMesh/Make/options
+++ b/executables/cartesian2DMesh/Make/options
@@ -6,6 +6,7 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
- -lfiniteVolume -lmeshTools \
+ -lfiniteVolume \
+ -lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
diff --git a/executables/cartesianMesh/Make/options b/executables/cartesianMesh/Make/options
index 267dbcc3..cf583700 100644
--- a/executables/cartesianMesh/Make/options
+++ b/executables/cartesianMesh/Make/options
@@ -6,6 +6,7 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
- -lfiniteVolume -lmeshTools \
+ -lfiniteVolume \
+ -lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
diff --git a/executables/pMesh/Make/options b/executables/pMesh/Make/options
index 267dbcc3..cf583700 100644
--- a/executables/pMesh/Make/options
+++ b/executables/pMesh/Make/options
@@ -6,6 +6,7 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
- -lfiniteVolume -lmeshTools \
+ -lfiniteVolume \
+ -lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
diff --git a/executables/tetMesh/Make/options b/executables/tetMesh/Make/options
index 267dbcc3..cf583700 100644
--- a/executables/tetMesh/Make/options
+++ b/executables/tetMesh/Make/options
@@ -6,6 +6,7 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
- -lfiniteVolume -lmeshTools \
+ -lfiniteVolume \
+ -lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
diff --git a/meshLibrary/Make/options b/meshLibrary/Make/options
index ca23dfb9..26c06f00 100644
--- a/meshLibrary/Make/options
+++ b/meshLibrary/Make/options
@@ -4,4 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
-LIB_LIBS = -lmeshTools
+LIB_LIBS = \
+ -lsurfMesh \
+ -lmeshTools
diff --git a/utilities/FLMAToSurface/Make/options b/utilities/FLMAToSurface/Make/options
index 267dbcc3..3efeacba 100644
--- a/utilities/FLMAToSurface/Make/options
+++ b/utilities/FLMAToSurface/Make/options
@@ -6,6 +6,8 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
- -lfiniteVolume -lmeshTools \
+ -lfiniteVolume \
+ -lsurfMesh \
+ -lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
diff --git a/utilities/mergeSurfacePatches/Make/options b/utilities/mergeSurfacePatches/Make/options
index 267dbcc3..3efeacba 100644
--- a/utilities/mergeSurfacePatches/Make/options
+++ b/utilities/mergeSurfacePatches/Make/options
@@ -6,6 +6,8 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
- -lfiniteVolume -lmeshTools \
+ -lfiniteVolume \
+ -lsurfMesh \
+ -lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
diff --git a/utilities/preparePar/Make/options b/utilities/preparePar/Make/options
index b6388847..7b2d3858 100644
--- a/utilities/preparePar/Make/options
+++ b/utilities/preparePar/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
EXE_LIBS = \
- -ldecompose
+ -ldecompose \
+ -ldecompositionMethods
diff --git a/utilities/subsetToPatch/Make/options b/utilities/subsetToPatch/Make/options
index 267dbcc3..3efeacba 100644
--- a/utilities/subsetToPatch/Make/options
+++ b/utilities/subsetToPatch/Make/options
@@ -6,6 +6,8 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
- -lfiniteVolume -lmeshTools \
+ -lfiniteVolume \
+ -lsurfMesh \
+ -lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
diff --git a/utilities/surfaceGenerateBoundingBox/Make/options b/utilities/surfaceGenerateBoundingBox/Make/options
index 267dbcc3..3efeacba 100644
--- a/utilities/surfaceGenerateBoundingBox/Make/options
+++ b/utilities/surfaceGenerateBoundingBox/Make/options
@@ -6,6 +6,8 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
- -lfiniteVolume -lmeshTools \
+ -lfiniteVolume \
+ -lsurfMesh \
+ -lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
diff --git a/utilities/surfaceToFMS/Make/options b/utilities/surfaceToFMS/Make/options
index 267dbcc3..cf583700 100644
--- a/utilities/surfaceToFMS/Make/options
+++ b/utilities/surfaceToFMS/Make/options
@@ -6,6 +6,7 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
- -lfiniteVolume -lmeshTools \
+ -lfiniteVolume \
+ -lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
--
GitLab