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

COMP: simplify Make/options

parent 9c8e4c5b
Branches
Tags
1 merge request!1Integration update methods
Showing
with 43 additions and 275 deletions
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
File mode changed from 100755 to 100644
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
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
EXE_INC = \
$(OMP_FLAGS) $(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
$(COMP_OPENMP) \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = $(LIBS)
LIB_LIBS = -lmeshTools
EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary \
-ledgeMesh \
-ltriSurface \
-lmeshTools
EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary \
-ledgeMesh \
-ltriSurface \
-lmeshTools
EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary \
-ledgeMesh \
-ltriSurface \
-lmeshTools
EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) -g -ggdb -DFULLDEBUG -O0 \
-lmeshLibrary \
-ledgeMesh \
-ltriSurface \
-lmeshTools
EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary \
-ledgeMesh \
-ltriSurface \
-lmeshTools
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
CFMESH_MACROS = -DNoSizeType
else
CFMESH_MACROS =
endif
ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
else
CFMESH_LIBS = -lmeshTools -lfiniteVolume
endif
endif
EXE_INC = \
$(CFMESH_MACROS) \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/edgeMesh/lnInclude \
-I../../meshLibrary/lnInclude
EXE_LIBS = \
$(CFMESH_LIBS) \
-lfiniteVolume -lmeshTools \
-L$(FOAM_USER_LIBBIN) \
-lmeshLibrary
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment