Skip to content
Snippets Groups Projects
Commit 81c96a2d authored by Mark OLESEN's avatar Mark OLESEN
Browse files

COMP: skip reactingEulerFoam compilation on mingw (#1238)

- pending resolution of cyclic dependencies
parent 510dafe0
No related branches found
No related tags found
No related merge requests found
Showing
with 70 additions and 32 deletions
...@@ -4,6 +4,16 @@ cd ${0%/*} || exit 1 # Run from this directory ...@@ -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 $* reactingTwoPhaseEulerFoam/Allwmake $targetType $*
reactingMultiphaseEulerFoam/Allwmake $targetType $* reactingMultiphaseEulerFoam/Allwmake $targetType $*
wmake $targetType functionObjects wmake $targetType functionObjects
......
...@@ -7,5 +7,5 @@ EXE_INC = \ ...@@ -7,5 +7,5 @@ EXE_INC = \
-I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude -I$(LIB_SRC)/phaseSystemModels/reactingEulerFoam/phaseSystems/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lfieldFunctionObjects \ -lfiniteVolume \
-lfiniteVolume -lfieldFunctionObjects
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
#------------------------------------------------------------------------------
wmake $targetType wmake $targetType
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
#------------------------------------------------------------------------------
wmakeLnInclude reactingEulerFoam/interfacialCompositionModels wmakeLnInclude reactingEulerFoam/interfacialCompositionModels
wmakeLnInclude reactingEulerFoam/interfacialModels wmakeLnInclude reactingEulerFoam/interfacialModels
wmakeLnInclude reactingEulerFoam/derivedFvPatchFields 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/phaseSystems
wmake $targetType reactingEulerFoam/interfacialModels wmake $targetType reactingEulerFoam/interfacialModels
wmake $targetType reactingEulerFoam/interfacialCompositionModels wmake $targetType reactingEulerFoam/interfacialCompositionModels
...@@ -19,5 +29,4 @@ wmake $targetType reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompr ...@@ -19,5 +29,4 @@ wmake $targetType reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompr
wmake $targetType reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem wmake $targetType reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem
wmake $targetType reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels wmake $targetType reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I../phaseSystems/lnInclude \ -I../phaseSystems/lnInclude \
-I../interfacialModels/lnInclude\ -I../interfacialModels/lnInclude\
-I../interfacialCompositionModels/lnInclude \ -I../interfacialCompositionModels/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/transportModel \ -I$(LIB_SRC)/transportModels/incompressible/transportModel \
...@@ -17,4 +17,6 @@ LIB_LIBS = \ ...@@ -17,4 +17,6 @@ LIB_LIBS = \
-lmeshTools \ -lmeshTools \
-lreactingPhaseSystem \ -lreactingPhaseSystem \
-lreactingEulerianInterfacialModels \ -lreactingEulerianInterfacialModels \
-lreactingEulerianInterfacialCompositionModels -lreactingEulerianInterfacialCompositionModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels
...@@ -16,6 +16,7 @@ EXE_INC = \ ...@@ -16,6 +16,7 @@ EXE_INC = \
LIB_LIBS = \ LIB_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lreactionThermophysicalModels \ -lreactionThermophysicalModels \
-lspecie -lspecie
...@@ -11,7 +11,10 @@ EXE_INC = \ ...@@ -11,7 +11,10 @@ EXE_INC = \
LIB_LIBS = \ LIB_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lspecie \ -lspecie \
-lreactingPhaseSystem -lreactingPhaseSystem \
-lturbulenceModels \
-lcompressibleTurbulenceModels
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I../interfacialModels/lnInclude \ -I../interfacialModels/lnInclude \
-I../interfacialCompositionModels/lnInclude \ -I../interfacialCompositionModels/lnInclude \
-I../derivedFvPatchFields/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/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
...@@ -16,6 +16,8 @@ EXE_INC = \ ...@@ -16,6 +16,8 @@ EXE_INC = \
LIB_LIBS = \ LIB_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \
-lsampling \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-lreactionThermophysicalModels \ -lreactionThermophysicalModels \
......
...@@ -4,6 +4,8 @@ EXE_INC = \ ...@@ -4,6 +4,8 @@ EXE_INC = \
-I../../interfacialModels/lnInclude\ -I../../interfacialModels/lnInclude\
-I../../interfacialCompositionModels/lnInclude \ -I../../interfacialCompositionModels/lnInclude \
-I../../derivedFvPatchFields/lnInclude \ -I../../derivedFvPatchFields/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
...@@ -11,16 +13,16 @@ EXE_INC = \ ...@@ -11,16 +13,16 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/incompressible/transportModel \ -I$(LIB_SRC)/transportModels/incompressible/transportModel \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lfiniteVolume \
-lfvOptions \
-lmeshTools \
-lreactingPhaseSystem \ -lreactingPhaseSystem \
-lreactingMultiphaseSystem \ -lreactingMultiphaseSystem \
-lreactingEulerianInterfacialModels \ -lreactingEulerianInterfacialModels \
-lreactingEulerianInterfacialCompositionModels \ -lreactingEulerianInterfacialCompositionModels \
-lreactingEulerianFvPatchFields \ -lreactingEulerianFvPatchFields \
-lfiniteVolume \ -lturbulenceModels \
-lfvOptions \ -lcompressibleTurbulenceModels
-lmeshTools
...@@ -5,6 +5,9 @@ EXE_INC = \ ...@@ -5,6 +5,9 @@ EXE_INC = \
-I../multiphaseCompressibleTurbulenceModels/lnInclude \ -I../multiphaseCompressibleTurbulenceModels/lnInclude \
-I../../derivedFvPatchFields/lnInclude \ -I../../derivedFvPatchFields/lnInclude \
-IalphaContactAngle \ -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/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
...@@ -12,11 +15,12 @@ EXE_INC = \ ...@@ -12,11 +15,12 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lfiniteVolume \
-lfvOptions \
-lmeshTools \
-lsampling \
-lcombustionModels \ -lcombustionModels \
-lreactingPhaseSystem -lreactingPhaseSystem
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I../twoPhaseSystem/lnInclude \ -I../twoPhaseSystem/lnInclude \
-I../../phaseSystems/lnInclude \ -I../../phaseSystems/lnInclude \
-I../../interfacialModels/lnInclude\ -I../../interfacialModels/lnInclude\
-I../../interfacialCompositionModels/lnInclude \ -I../../interfacialCompositionModels/lnInclude \
-I../../derivedFvPatchFields/lnInclude \ -I../../derivedFvPatchFields/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/transportModel \ -I$(LIB_SRC)/transportModels/incompressible/transportModel \
......
...@@ -4,6 +4,9 @@ EXE_INC = \ ...@@ -4,6 +4,9 @@ EXE_INC = \
-I../../phaseSystems/lnInclude \ -I../../phaseSystems/lnInclude \
-I../twoPhaseCompressibleTurbulenceModels/lnInclude \ -I../twoPhaseCompressibleTurbulenceModels/lnInclude \
-I../../derivedFvPatchFields/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/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
...@@ -12,10 +15,12 @@ EXE_INC = \ ...@@ -12,10 +15,12 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lsampling \
-lcombustionModels \ -lcombustionModels \
-lreactingPhaseSystem -lreactingPhaseSystem \
-lturbulenceModels \
-lcompressibleTurbulenceModels
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment