Updated options files

executables/cartesian2DMesh/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
+    $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -6,9 +27,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lmeshTools \
-    -ltriSurface \
-    -lfiniteVolume \
-    -ledgeMesh \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

executables/cartesianMesh/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
+    $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -6,9 +27,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lmeshTools \
-    -ltriSurface \
-    -lfiniteVolume \
-    -ledgeMesh \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

executables/pMesh/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
+    $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -6,9 +27,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lmeshTools \
-    -ltriSurface \
-    -lfiniteVolume \
-    -ledgeMesh \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

executables/tetMesh/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
+    $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -6,9 +27,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lmeshTools \
-    -ltriSurface \
-    -lfiniteVolume \
-    -ledgeMesh \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

meshLibrary/Make/options

-#if defined(__GNUC__)
-#   if defined(darwinIntel64)
-        OMP_FLAGS =
-#   else
-        OMP_FLAGS = -DUSE_OMP -fopenmp
-#   endif
-#else
-   OMP_FLAGS =
-#endif
+ifeq (Gcc,$(findstring Gcc,$(WM_COMPILER)))
+    OMP_FLAGS = -DUSE_OMP -fopenmp
+else
+    OMP_FLAGS =
+endif
+
+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+	CFMESH_MACROS = -DNoSizeType
+        LIBS =
+    else
+        CFMESH_MACROS =
+        LIBS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_MACROS = -DExtendSpecific
+        LIBS = -lmeshTools -ledgeMesh
+    else
+        CFMESH_MACROS =
+    endif
+endif
 
 EXE_INC = \
-    $(OMP_FLAGS) \
+    $(OMP_FLAGS) $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
+
+LIB_LIBS = $(LIBS)

utilities/FLMAToSurface/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
+    $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -ltriSurface \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -lmeshTools \
-    -ledgeMesh
+    -lmeshLibrary

utilities/FMSToSurface/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
-    -I$(FOAM_SRC)/meshTools/lnInclude \
-    -I$(FOAM_SRC)/triSurface/lnInclude \
-    -I$(FOAM_SRC)/edgeMesh/lnInclude
+    $(CFMESH_MACROS) \
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -ltriSurface \
-    -lmeshTools \
-    -ledgeMesh \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/FMSToVTK/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
-    -I$(FOAM_SRC)/meshTools/lnInclude \
-    -I$(FOAM_SRC)/triSurface/lnInclude \
-    -I$(FOAM_SRC)/edgeMesh/lnInclude
+    $(CFMESH_MACROS) \
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -ltriSurface \
-    -ledgeMesh \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -lmeshTools
+    -lmeshLibrary

utilities/checkSurfaceMesh/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
+    $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -ltriSurface \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -lmeshTools \
-    -ledgeMesh
+    -lmeshLibrary

utilities/copySurfaceParts/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
+    $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -ltriSurface \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -lmeshTools \
-    -ledgeMesh
+    -lmeshLibrary

utilities/extrudeEdgesInto2DSurface/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
-    -I$(FOAM_SRC)/triSurface/lnInclude \
+    $(CFMESH_MACROS) \
+    -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -ltriSurface \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -lmeshTools \
-    -ledgeMesh
+    -lmeshLibrary

utilities/generateBoundaryLayers/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
+    $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lmeshTools \
-    -ltriSurface \
-    -ledgeMesh \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/importSurfaceAsSubset/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
+    $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -ltriSurface \
-    -ledgeMesh \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -lmeshTools
+    -lmeshLibrary

utilities/improveMeshQuality/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
+    $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lmeshTools \
-    -ltriSurface \
-    -ledgeMesh \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/improveSymmetryPlanes/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
+    $(CFMESH_MACROS) \
+    -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lmeshTools \
-    -ledgeMesh \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/mergeSurfacePatches/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
-    -I$(FOAM_SRC)/meshTools/lnInclude \
-    -I$(FOAM_SRC)/triSurface/lnInclude \
-    -I$(FOAM_SRC)/edgeMesh/lnInclude
+    $(CFMESH_MACROS) \
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -ltriSurface \
-    -ledgeMesh \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -lmeshTools
+    -lmeshLibrary

utilities/meshToFPMA/Make/options

+ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
+    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
+        CFMESH_MACROS = -DNoSizeType
+    else
+        CFMESH_MACROS =
+    endif
+endif
+
+ifeq ($(WM_PROJECT), foam)
+    VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
+    ifeq ($(VER), 1)
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS = -DExtendSpecific
+    else
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_MACROS =
+    endif
+endif
+
 EXE_INC = \
-    -I../../meshLibrary/lnInclude \
+    $(CFMESH_MACROS) \
+    -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/edgeMesh/lnInclude \
+    -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
+    $(CFMESH_LIBS) \
     -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -ledgeMesh \