COMP: skip reactingEulerFoam compilation on mingw (#1238)

- pending resolution of cyclic dependencies
2019-06-14 13:58:37 +02:00 · 2019-06-14 13:58:37 +02:00 · f0a4f8ee48
commit f0a4f8ee48
parent fd6af75475
12 changed files with 70 additions and 32 deletions
--- a/applications/solvers/multiphase/reactingEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
@ -4,6 +4,16 @@ cd ${0%/*} || exit 1                        # Run from this directory

 #------------------------------------------------------------------------------

+case "$WM_COMPILER" in
+Mingw*)
+    echo "Skipping $WM_COMPILER compilation of $PWD"
+    echo "... needs further resolution of cyclic dependencies"
+    exit 0
+    ;;
+esac
+
+#------------------------------------------------------------------------------
+
 reactingTwoPhaseEulerFoam/Allwmake $targetType $*
 reactingMultiphaseEulerFoam/Allwmake $targetType $*
 wmake $targetType functionObjects
--- a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/Make/options
@ -7,5 +7,5 @@ EXE_INC = \
    -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude

 LIB_LIBS = \
-    -lfieldFunctionObjects \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -lfieldFunctionObjects
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
@ -1,9 +1,9 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
+cd ${0%/*} || exit 1                        # Run from this directory
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments

+#------------------------------------------------------------------------------
+
 wmake $targetType

 #------------------------------------------------------------------------------
--- a/src/phaseSystemModels/Allwmake
+++ b/src/phaseSystemModels/Allwmake
@ -1,13 +1,23 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
+cd ${0%/*} || exit 1                        # Run from this directory
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments

+#------------------------------------------------------------------------------
+
 wmakeLnInclude reactingEulerFoam/interfacialCompositionModels
 wmakeLnInclude reactingEulerFoam/interfacialModels
 wmakeLnInclude reactingEulerFoam/derivedFvPatchFields

+case "$WM_COMPILER" in
+Mingw*)
+    echo "Skipping $WM_COMPILER compilation of $PWD"
+    echo "... needs further resolution of cyclic dependencies"
+    exit 0
+    ;;
+esac
+
+#------------------------------------------------------------------------------
+
 wmake $targetType  reactingEulerFoam/phaseSystems
 wmake $targetType  reactingEulerFoam/interfacialModels
 wmake $targetType  reactingEulerFoam/interfacialCompositionModels
@ -19,5 +29,4 @@ wmake $targetType  reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompr
 wmake $targetType  reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem
 wmake $targetType  reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels

-
 #------------------------------------------------------------------------------
--- a/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/derivedFvPatchFields/Make/options
@ -1,9 +1,9 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
    -I../phaseSystems/lnInclude \
    -I../interfacialModels/lnInclude\
    -I../interfacialCompositionModels/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/transportModels/incompressible/transportModel \
@ -17,4 +17,6 @@ LIB_LIBS = \
    -lmeshTools \
    -lreactingPhaseSystem \
    -lreactingEulerianInterfacialModels \
-    -lreactingEulerianInterfacialCompositionModels
+    -lreactingEulerianInterfacialCompositionModels \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels
--- a/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/interfacialCompositionModels/Make/options
@ -16,6 +16,7 @@ EXE_INC = \

 LIB_LIBS = \
    -lfiniteVolume \
+    -lmeshTools \
    -lfluidThermophysicalModels \
    -lreactionThermophysicalModels \
    -lspecie
--- a/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/interfacialModels/Make/options
@ -11,7 +11,10 @@ EXE_INC = \

 LIB_LIBS = \
    -lfiniteVolume \
+    -lmeshTools \
    -lfluidThermophysicalModels \
    -lcompressibleTransportModels \
    -lspecie \
-    -lreactingPhaseSystem
+    -lreactingPhaseSystem \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels
--- a/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/phaseSystems/Make/options
@ -1,10 +1,10 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
    -I../interfacialModels/lnInclude \
    -I../interfacialCompositionModels/lnInclude \
    -I../derivedFvPatchFields/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@ -16,6 +16,8 @@ EXE_INC = \

 LIB_LIBS = \
    -lfiniteVolume \
+    -lmeshTools \
+    -lsampling \
    -lfluidThermophysicalModels \
    -lspecie \
    -lreactionThermophysicalModels \
--- a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/Make/options
@ -4,6 +4,8 @@ EXE_INC = \
    -I../../interfacialModels/lnInclude\
    -I../../interfacialCompositionModels/lnInclude \
    -I../../derivedFvPatchFields/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@ -11,16 +13,16 @@ EXE_INC = \
    -I$(LIB_SRC)/transportModels/incompressible/transportModel \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude

 LIB_LIBS = \
+    -lfiniteVolume \
+    -lfvOptions \
+    -lmeshTools \
    -lreactingPhaseSystem \
    -lreactingMultiphaseSystem \
    -lreactingEulerianInterfacialModels \
    -lreactingEulerianInterfacialCompositionModels \
    -lreactingEulerianFvPatchFields \
-    -lfiniteVolume \
-    -lfvOptions \
-    -lmeshTools
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels
--- a/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options
@ -5,6 +5,9 @@ EXE_INC = \
    -I../multiphaseCompressibleTurbulenceModels/lnInclude \
    -I../../derivedFvPatchFields/lnInclude \
    -IalphaContactAngle \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@ -12,11 +15,12 @@ EXE_INC = \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
-    -I$(LIB_SRC)/combustionModels/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude
+    -I$(LIB_SRC)/combustionModels/lnInclude

 LIB_LIBS = \
+    -lfiniteVolume \
+    -lfvOptions \
+    -lmeshTools \
+    -lsampling \
    -lcombustionModels \
    -lreactingPhaseSystem
--- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options
@ -1,11 +1,11 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
    -I../twoPhaseSystem/lnInclude \
    -I../../phaseSystems/lnInclude \
    -I../../interfacialModels/lnInclude\
    -I../../interfacialCompositionModels/lnInclude \
    -I../../derivedFvPatchFields/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/transportModels/incompressible/transportModel \
--- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options
+++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options
@ -4,6 +4,9 @@ EXE_INC = \
    -I../../phaseSystems/lnInclude \
    -I../twoPhaseCompressibleTurbulenceModels/lnInclude \
    -I../../derivedFvPatchFields/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@ -12,10 +15,12 @@ EXE_INC = \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
    -I$(LIB_SRC)/combustionModels/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude

 LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
+    -lsampling \
    -lcombustionModels \
-    -lreactingPhaseSystem
+    -lreactingPhaseSystem \
+    -lturbulenceModels \
+    -lcompressibleTurbulenceModels