From d469bbae4b248879c6edd6a92e26fcb5ffbab5d1 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 17 May 2018 08:39:57 +0100
Subject: [PATCH] COMP: Allwmake: feed through 'objects' targer for
wmakeCollect
---
applications/solvers/multiphase/MPPICInterFoam/Allwmake | 4 ++--
.../multiphase/interCondensatingEvaporatingFoam/Allwmake | 3 +--
applications/utilities/mesh/generation/foamyMesh/Allwmake | 4 ++--
applications/utilities/surface/surfaceFeatureExtract/Allwmake | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/applications/solvers/multiphase/MPPICInterFoam/Allwmake b/applications/solvers/multiphase/MPPICInterFoam/Allwmake
index 6e71a313cc6..7b128ad2e66 100755
--- a/applications/solvers/multiphase/MPPICInterFoam/Allwmake
+++ b/applications/solvers/multiphase/MPPICInterFoam/Allwmake
@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
-wmake libso CompressibleTwoPhaseMixtureTurbulenceModels
-wmake
+wmake $targetType CompressibleTwoPhaseMixtureTurbulenceModels
+wmake $targetType
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake
index e64b0d12850..bb5db1b94fc 100755
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake
@@ -1,11 +1,10 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
-targetType=libso # Preferred library type
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
#------------------------------------------------------------------------------
wmake $targetType temperaturePhaseChangeTwoPhaseMixtures
-wmake
+wmake $targetType
#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/generation/foamyMesh/Allwmake b/applications/utilities/mesh/generation/foamyMesh/Allwmake
index 3dc79feaf81..beef89b54a5 100755
--- a/applications/utilities/mesh/generation/foamyMesh/Allwmake
+++ b/applications/utilities/mesh/generation/foamyMesh/Allwmake
@@ -12,8 +12,8 @@ if have_cgal
then
wmake $targetType conformalVoronoiMesh
wmake $targetType conformalVoronoi2DMesh
- wmake foamyQuadMesh
- wmake foamyHexMesh
+ wmake $targetType foamyQuadMesh
+ wmake $targetType foamyHexMesh
# wmake foamyHexMeshBackgroundMesh
# (cd foamyHexMeshSurfaceSimplify && ./Allwmake)
# wmake cellSizeAndAlignmentGrid
diff --git a/applications/utilities/surface/surfaceFeatureExtract/Allwmake b/applications/utilities/surface/surfaceFeatureExtract/Allwmake
index 913a79b6409..ed3666a3da9 100755
--- a/applications/utilities/surface/surfaceFeatureExtract/Allwmake
+++ b/applications/utilities/surface/surfaceFeatureExtract/Allwmake
@@ -2,6 +2,6 @@
cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-(wmake libso extractionMethod && wmake)
+(wmake $targetType extractionMethod && wmake $targetType)
#------------------------------------------------------------------------------
--
GitLab