Skip to content
GitLab
Explore
Sign in
Register
This is an archived project. Repository and other project resources are read-only.
Commits on Source (1)
ENH: support module install prefix (default to user)
· 1cd40512
Mark OLESEN
authored
Jun 07, 2020
1cd40512
Hide whitespace changes
Inline
Side-by-side
Allwclean
View file @
1cd40512
...
...
@@ -3,8 +3,8 @@ cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
wclean
libso
meshLibrary
wclean all executables
wclean all utilities
wclean meshLibrary
wclean
-
all
executables
wclean
-
all
utilities
#------------------------------------------------------------------------------
Allwmake
View file @
1cd40512
#!/bin/sh
cd
${
0
%/*
}
||
exit
1
# Run from this directory
# Parse arguments for library compilation
if
[
-f
$WM_PROJECT_DIR
/wmake/scripts/AllwmakeParseArguments
]
then
.
$WM_PROJECT_DIR
/wmake/scripts/AllwmakeParseArguments
if
[
-f
"
$WM_PROJECT_DIR
"
/wmake/scripts/AllwmakeParseArguments
]
then
.
"
$WM_PROJECT_DIR
"
/wmake/scripts/AllwmakeParseArguments
fi
#------------------------------------------------------------------------------
...
...
@@ -12,11 +10,12 @@ date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
echo
"Starting compile of cfMesh with
${
WM_PROJECT_DIR
##*/
}
${
0
##*
}
"
echo
"
$WM_COMPILER
$WM_COMPILER_TYPE
compiler"
echo
"
${
WM_OPTIONS
}
, with
${
WM_MPLIB
}
${
FOAM_MPI
}
"
echo
" prefix =
${
FOAM_MODULE_PREFIX
:-
default
(user)
}
"
echo
wmake libso meshLibrary
wmake all executables
wmake all utilities
wmake
-
all
executables
wmake
-
all
utilities
# Some summary information
echo
...
...
executables/cartesian2DMesh/Make/files
View file @
1cd40512
cartesian2DMesh.C
EXE = $(FOAM_APPBIN)/cartesian2DMesh
EXE = $(FOAM_
MODULE_
APPBIN)/cartesian2DMesh
executables/cartesian2DMesh/Make/options
View file @
1cd40512
sinclude $(GENERAL_RULES)/module-path-user
/* Failsafe - user location */
ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
endif
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
...
...
@@ -8,5 +18,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
-L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
executables/cartesianMesh/Make/files
View file @
1cd40512
cartesianMesh.C
EXE = $(FOAM_APPBIN)/cartesianMesh
EXE = $(FOAM_
MODULE_
APPBIN)/cartesianMesh
executables/cartesianMesh/Make/options
View file @
1cd40512
sinclude $(GENERAL_RULES)/module-path-user
/* Failsafe - user location */
ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
endif
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
...
...
@@ -8,5 +18,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
-L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
executables/pMesh/Make/files
View file @
1cd40512
pMesh.C
EXE = $(FOAM_APPBIN)/pMesh
EXE = $(FOAM_
MODULE_
APPBIN)/pMesh
executables/pMesh/Make/options
View file @
1cd40512
sinclude $(GENERAL_RULES)/module-path-user
/* Failsafe - user location */
ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
endif
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
...
...
@@ -8,5 +18,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
-L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
executables/tetMesh/Make/files
View file @
1cd40512
tetMesh.C
EXE = $(FOAM_APPBIN)/tetMesh
EXE = $(FOAM_
MODULE_
APPBIN)/tetMesh
executables/tetMesh/Make/options
View file @
1cd40512
sinclude $(GENERAL_RULES)/module-path-user
/* Failsafe - user location */
ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
endif
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
...
...
@@ -8,5 +18,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
-L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
meshLibrary/Make/files
View file @
1cd40512
...
...
@@ -465,4 +465,4 @@ $(writeAsFPMA)/fpmaMesh.C
$(workflowControls)/workflowControls.C
LIB = $(FOAM_LIBBIN)/libmeshLibrary
LIB = $(FOAM_
MODULE_
LIBBIN)/libmeshLibrary
meshLibrary/Make/options
View file @
1cd40512
sinclude $(GENERAL_RULES)/module-path-user
/* Failsafe - user location */
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \
$(COMP_OPENMP) \
-I$(LIB_SRC)/fileFormats/lnInclude \
...
...
testingInterfaces/testAnisotropicMeshing/Make/options
View file @
1cd40512
sinclude $(GENERAL_RULES)/module-path-user
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
...
...
@@ -5,6 +11,5 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary \
-lmeshTools
-lmeshTools \
-L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
testingInterfaces/testBndLayerRefinement/Make/options
View file @
1cd40512
sinclude $(GENERAL_RULES)/module-path-user
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
...
...
@@ -5,6 +11,5 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary \
-lmeshTools
-lmeshTools \
-L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
testingInterfaces/testBndLayerSmoothing/Make/options
View file @
1cd40512
sinclude $(GENERAL_RULES)/module-path-user
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
...
...
@@ -5,6 +11,5 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary \
-lmeshTools
-lmeshTools \
-L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
testingInterfaces/testDynList/Make/options
View file @
1cd40512
sinclude $(GENERAL_RULES)/module-path-user
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \
-g -ggdb -DFULLDEBUG -O0 \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) -g -ggdb -DFULLDEBUG -O0 \
-lmeshLibrary \
-lmeshTools
-lmeshTools \
-L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
testingInterfaces/testEdgeExtractorFUN/Make/options
View file @
1cd40512
sinclude $(GENERAL_RULES)/module-path-user
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
...
...
@@ -5,6 +11,5 @@ EXE_INC = \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary \
-lmeshTools
-lmeshTools \
-L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
utilities/FLMAToSurface/Make/files
View file @
1cd40512
FLMAToSurface.C
EXE = $(FOAM_APPBIN)/FLMAToSurface
EXE = $(FOAM_
MODULE_
APPBIN)/FLMAToSurface
utilities/FLMAToSurface/Make/options
View file @
1cd40512
sinclude $(GENERAL_RULES)/module-path-user
/* Failsafe - user location */
ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
endif
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
...
...
@@ -9,5 +19,4 @@ EXE_LIBS = \
-lfiniteVolume \
-lsurfMesh \
-lmeshTools \
-L$(FOAM_LIBBIN) \
-lmeshLibrary
-L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
utilities/FMSToSurface/Make/files
View file @
1cd40512
FMSToSurface.C
EXE = $(FOAM_APPBIN)/FMSToSurface
EXE = $(FOAM_
MODULE_
APPBIN)/FMSToSurface
Prev
1
2
3
Next