Updating conditional statements in Make/files to use environment variables and ifeq and ifneq

2020-12-31 17:38:09 +00:00
parent 9105b80a55
commit c1ebcc1a78
3 changed files with 3 additions and 3 deletions
--- a/src/OSspecific/POSIX/Make/files
+++ b/src/OSspecific/POSIX/Make/files
@ -16,7 +16,7 @@ memInfo/memInfo.C
 # to use stat (=timestamps) instead of inotify
 fileMonitor.C

-ifdef SunOS64
+ifeq "$(WM_ARCH)" "SunOS64"
    dummyPrintStack.C
 else
    printStack.C
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@ -66,7 +66,7 @@ primitives/Tensor/lists/symmTensorList.C
 primitives/Tensor/lists/tensorList.C

 primitives/Vector/complexVector/complexVector.C
-ifndef $(WM_SP)
+ifneq "$(WM_PRECISION_OPTION)" "SP"
 primitives/Vector/floatVector/floatVector.C
 primitives/Tensor/floatTensor/floatTensor.C
 endif
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
@ -1,7 +1,7 @@
 # Needs ParMGridGen environment variable set. (see Allwmake script)

 TYPE_REAL =
-ifndef $(WM_SP)
+ifneq "$(WM_PRECISION_OPTION)" "SP"
    TYPE_REAL = -DTYPE_REAL
 endif