wmake, wmakeLnIncludeAll: Automated the creation of the lnInclude directories based on dependency
Now lnInclude are created as required by the presence of entries in the EXE_INC variable in the Make/options file. This removes the need for calling wmakeLnInclude in various Allwmake files to ensure the existence of the lnInclude directories prior to compilation of dependent libraries.
This commit is contained in:
@ -21,8 +21,6 @@ wmakeCheckPwd "$WM_PROJECT_DIR/src" || {
|
||||
# Update OpenFOAM version strings if required
|
||||
wmakePrintBuild -check || wrmo OpenFOAM/global/global.o 2>/dev/null
|
||||
|
||||
wmakeLnInclude OpenFOAM
|
||||
wmakeLnInclude OSspecific/${WM_OSTYPE:-POSIX}
|
||||
Pstream/Allwmake $targetType $*
|
||||
|
||||
OSspecific/${WM_OSTYPE:-POSIX}/Allwmake $targetType $*
|
||||
@ -35,11 +33,8 @@ wmake $targetType meshTools
|
||||
|
||||
# Decomposition methods needed by dummyThirdParty
|
||||
# (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
|
||||
parallel/decompose/AllwmakeLnInclude
|
||||
dummyThirdParty/Allwmake $targetType $*
|
||||
|
||||
wmakeLnInclude fvOptions
|
||||
|
||||
wmake $targetType finiteVolume
|
||||
wmake $targetType lagrangian/basic
|
||||
wmake $targetType lagrangian/distributionModels
|
||||
|
||||
@ -36,8 +36,6 @@ wmakeMpiLib()
|
||||
done
|
||||
}
|
||||
|
||||
wmakeLnInclude decompositionMethods
|
||||
|
||||
if [ -n "$SCOTCH_ARCH_PATH" ]
|
||||
then
|
||||
wmake $targetType scotchDecomp
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
#!/bin/sh
|
||||
cd ${0%/*} || exit 1 # Run from this directory
|
||||
|
||||
wmakeLnInclude decompositionMethods
|
||||
wmakeLnInclude metisDecomp
|
||||
wmakeLnInclude scotchDecomp
|
||||
wmakeLnInclude ptscotchDecomp
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
Reference in New Issue
Block a user