ENH: use FOAM_MODULE_{PREFIX,LIBBIN} for defining locations

- defaults to user locations

Allwmake

 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 targetType=libso
-. ${WM_PROJECT_DIR:?}/wmake/scripts/wmake.cmake-args
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
 # -----------------------------------------------------------------------------
-
-if [ -n "$CMAKE_INSTALL_PREFIX" ]
-then
-    export CMAKE_INSTALL_PREFIX
-fi
-
-#------------------------------------------------------------------------------
 echo "========================================"
 date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
 echo "Starting compile of adiosFoam 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
 
 src/Allwmake $targetType $*

src/Allwmake

 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/wmake.cmake-args
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
 . ${WM_PROJECT_DIR:?}/wmake/scripts/have_adios2
-# -----------------------------------------------------------------------------
-
-if [ -n "$CMAKE_INSTALL_PREFIX" ]
-then
-    export CMAKE_INSTALL_PREFIX
-fi
-
 #------------------------------------------------------------------------------
 
 if have_adios2

src/adiosFoam/Allwmake

 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/wmake.cmake-args
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
 . ${WM_PROJECT_DIR:?}/wmake/scripts/have_adios2
 # -----------------------------------------------------------------------------
 
-if [ -n "$CMAKE_INSTALL_PREFIX" ]
-then
-    export CMAKE_INSTALL_PREFIX
-fi
-
 if have_adios2
 then
     wmake libso

src/adiosFoam/Make/files

@@ -16,4 +16,4 @@ write/adiosCoreWriteCloud.C
 
 time/adiosTime.C
 
-LIB = $(CMAKE_INSTALL_PREFIX)/lib/libadiosFoam
+LIB = $(FOAM_MODULE_LIBBIN)/libadiosFoam

src/adiosFoam/Make/options

 sinclude $(GENERAL_RULES)/ADIOS2
 
-/* Default is PROJECT target */
-ifeq (,$(CMAKE_INSTALL_PREFIX))
-    CMAKE_INSTALL_PREFIX := $(dir $(FOAM_LIBBIN))
+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
 endif
 
 EXE_INC = \

src/adiosWrite/Allwmake

 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/wmake.cmake-args
 . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
 . ${WM_PROJECT_DIR:?}/wmake/scripts/have_adios2
-# -----------------------------------------------------------------------------
-
-if [ -n "$CMAKE_INSTALL_PREFIX" ]
-then
-    export CMAKE_INSTALL_PREFIX
-fi
-
 #------------------------------------------------------------------------------
 
 if have_adios2
 then
-    # Extra compile/link options
-    adiosFoam=$(cd ../adiosFoam && pwd -P)
-
-    export ADIOS_EXTRA_COMP="-I$adiosFoam/lnInclude"
-    export ADIOS_EXTRA_LINK='-L$(FOAM_USER_LIBBIN) -ladiosFoam'
-
-    if [ -n "$CMAKE_INSTALL_PREFIX" ]
-    then
-        export ADIOS_EXTRA_LINK='-L$(CMAKE_INSTALL_PREFIX)/lib -ladiosFoam'
-    fi
-
     wmake libso
 else
     echo "==> skip adiosFoam library"

src/adiosWrite/Make/files

@@ -2,4 +2,4 @@ adiosReadData.C
 adiosWrite.C
 adiosWriteData.C
 
-LIB = $(CMAKE_INSTALL_PREFIX)/lib/libadiosFunctionObjects
+LIB = $(FOAM_MODULE_LIBBIN)/libadiosFunctionObjects

src/adiosWrite/Make/options

 sinclude $(GENERAL_RULES)/ADIOS2
 
-/* Default is PROJECT target */
-ifeq (,$(CMAKE_INSTALL_PREFIX))
-    CMAKE_INSTALL_PREFIX := $(dir $(FOAM_LIBBIN))
+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
 endif
 
 EXE_INC = \
     $(PFLAGS) $(PINC) $(ADIOS_FLAGS) \
-    ${ADIOS_EXTRA_COMP} \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/finiteArea/lnInclude \
@@ -23,11 +24,12 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
+    -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+    -I../adiosFoam/lnInclude
+
 
 LIB_LIBS = \
     $(PLIBS) $(ADIOS_LIBS) \
-    ${ADIOS_EXTRA_LINK} \
     -lmeshTools -lfiniteVolume -lfiniteArea \
     -llagrangian -llagrangianIntermediate -llagrangianSpray \
     -lmolecule \
@@ -35,4 +37,5 @@ LIB_LIBS = \
     -lSLGThermo \
     -lreactionThermophysicalModels \
     -lregionModels \
-    -lsurfaceFilmModels
+    -lsurfaceFilmModels \
+    -L$(FOAM_MODULE_LIBBIN) -ladiosFoam