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

ENH: support module install prefix (default to user)

parent 089e191a
No related branches found
No related tags found
No related merge requests found
Showing
with 118 additions and 41 deletions
...@@ -3,8 +3,8 @@ cd ${0%/*} || exit 1 # Run from this directory ...@@ -3,8 +3,8 @@ cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
wclean libso meshLibrary wclean meshLibrary
wclean all executables wclean -all executables
wclean all utilities wclean -all utilities
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
#!/bin/sh #!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory cd ${0%/*} || exit 1 # Run from this directory
if [ -f "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments ]
# Parse arguments for library compilation then . "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments
if [ -f $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments ]
then . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
...@@ -12,11 +10,12 @@ date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown" ...@@ -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 "Starting compile of cfMesh with ${WM_PROJECT_DIR##*/} ${0##*}"
echo " $WM_COMPILER $WM_COMPILER_TYPE compiler" echo " $WM_COMPILER $WM_COMPILER_TYPE compiler"
echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}" echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
echo " prefix = ${FOAM_MODULE_PREFIX:-default (user)}"
echo echo
wmake libso meshLibrary wmake libso meshLibrary
wmake all executables wmake -all executables
wmake all utilities wmake -all utilities
# Some summary information # Some summary information
echo echo
......
cartesian2DMesh.C cartesian2DMesh.C
EXE = $(FOAM_APPBIN)/cartesian2DMesh EXE = $(FOAM_MODULE_APPBIN)/cartesian2DMesh
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 = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
...@@ -8,5 +18,4 @@ EXE_INC = \ ...@@ -8,5 +18,4 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \ -lmeshTools \
-L$(FOAM_LIBBIN) \ -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
-lmeshLibrary
cartesianMesh.C cartesianMesh.C
EXE = $(FOAM_APPBIN)/cartesianMesh EXE = $(FOAM_MODULE_APPBIN)/cartesianMesh
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 = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
...@@ -8,5 +18,4 @@ EXE_INC = \ ...@@ -8,5 +18,4 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \ -lmeshTools \
-L$(FOAM_LIBBIN) \ -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
-lmeshLibrary
pMesh.C pMesh.C
EXE = $(FOAM_APPBIN)/pMesh EXE = $(FOAM_MODULE_APPBIN)/pMesh
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 = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
...@@ -8,5 +18,4 @@ EXE_INC = \ ...@@ -8,5 +18,4 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \ -lmeshTools \
-L$(FOAM_LIBBIN) \ -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
-lmeshLibrary
tetMesh.C tetMesh.C
EXE = $(FOAM_APPBIN)/tetMesh EXE = $(FOAM_MODULE_APPBIN)/tetMesh
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 = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
...@@ -8,5 +18,4 @@ EXE_INC = \ ...@@ -8,5 +18,4 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \ -lmeshTools \
-L$(FOAM_LIBBIN) \ -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
-lmeshLibrary
...@@ -465,4 +465,4 @@ $(writeAsFPMA)/fpmaMesh.C ...@@ -465,4 +465,4 @@ $(writeAsFPMA)/fpmaMesh.C
$(workflowControls)/workflowControls.C $(workflowControls)/workflowControls.C
LIB = $(FOAM_LIBBIN)/libmeshLibrary LIB = $(FOAM_MODULE_LIBBIN)/libmeshLibrary
sinclude $(GENERAL_RULES)/module-path-user
/* Failsafe - user location */
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \ EXE_INC = \
$(COMP_OPENMP) \ $(COMP_OPENMP) \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
......
sinclude $(GENERAL_RULES)/module-path-user
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
...@@ -5,6 +11,5 @@ EXE_INC = \ ...@@ -5,6 +11,5 @@ EXE_INC = \
-I../../meshLibrary/lnInclude -I../../meshLibrary/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \ -lmeshTools \
-lmeshLibrary \ -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
-lmeshTools
sinclude $(GENERAL_RULES)/module-path-user
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
...@@ -5,6 +11,5 @@ EXE_INC = \ ...@@ -5,6 +11,5 @@ EXE_INC = \
-I../../meshLibrary/lnInclude -I../../meshLibrary/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \ -lmeshTools \
-lmeshLibrary \ -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
-lmeshTools
sinclude $(GENERAL_RULES)/module-path-user
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
...@@ -5,6 +11,5 @@ EXE_INC = \ ...@@ -5,6 +11,5 @@ EXE_INC = \
-I../../meshLibrary/lnInclude -I../../meshLibrary/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \ -lmeshTools \
-lmeshLibrary \ -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
-lmeshTools
sinclude $(GENERAL_RULES)/module-path-user
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \ EXE_INC = \
-g -ggdb -DFULLDEBUG -O0 \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I../../meshLibrary/lnInclude -I../../meshLibrary/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) -g -ggdb -DFULLDEBUG -O0 \ -lmeshTools \
-lmeshLibrary \ -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
-lmeshTools
sinclude $(GENERAL_RULES)/module-path-user
ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
endif
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
...@@ -5,6 +11,5 @@ EXE_INC = \ ...@@ -5,6 +11,5 @@ EXE_INC = \
-I../../meshLibrary/lnInclude -I../../meshLibrary/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \ -lmeshTools \
-lmeshLibrary \ -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
-lmeshTools
FLMAToSurface.C FLMAToSurface.C
EXE = $(FOAM_APPBIN)/FLMAToSurface EXE = $(FOAM_MODULE_APPBIN)/FLMAToSurface
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 = \ EXE_INC = \
-I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \
...@@ -9,5 +19,4 @@ EXE_LIBS = \ ...@@ -9,5 +19,4 @@ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lsurfMesh \ -lsurfMesh \
-lmeshTools \ -lmeshTools \
-L$(FOAM_LIBBIN) \ -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary
-lmeshLibrary
FMSToSurface.C FMSToSurface.C
EXE = $(FOAM_APPBIN)/FMSToSurface EXE = $(FOAM_MODULE_APPBIN)/FMSToSurface
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment