Skip to content
Snippets Groups Projects
Commit 10524cb8 authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: eliminate ParaView_INST_DIR variable and simplify plugin Make/options

- the 'make install' target from ParaView now installs all of the
  includes necessary for compiling plugins.
parent d9664307
No related branches found
No related tags found
No related merge requests found
...@@ -2,12 +2,7 @@ EXE_INC = \ ...@@ -2,12 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(ParaView_DIR)/VTK \ -I$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR) \
-I$(ParaView_INST_DIR) \
-I$(ParaView_INST_DIR)/VTK \
-I$(ParaView_INST_DIR)/VTK/Common \
-I$(ParaView_INST_DIR)/VTK/Filtering \
-I$(ParaView_INST_DIR)/VTK/Rendering \
-I../../vtkPV3Readers/lnInclude \ -I../../vtkPV3Readers/lnInclude \
-I../PV3FoamReader -I../PV3FoamReader
......
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/mesh/blockMesh/lnInclude \ -I$(LIB_SRC)/mesh/blockMesh/lnInclude \
-I$(ParaView_DIR)/VTK \ -I$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR) \
-I$(ParaView_INST_DIR) \
-I$(ParaView_INST_DIR)/VTK \
-I$(ParaView_INST_DIR)/VTK/Common \
-I$(ParaView_INST_DIR)/VTK/Filtering \
-I$(ParaView_INST_DIR)/VTK/Rendering \
-I../../vtkPV3Readers/lnInclude \ -I../../vtkPV3Readers/lnInclude \
-I../PV3blockMeshReader -I../PV3blockMeshReader
......
EXE_INC = \ EXE_INC = \
-I$(ParaView_DIR)/VTK \ -I$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
-I$(ParaView_INST_DIR) \
-I$(ParaView_INST_DIR)/VTK \
-I$(ParaView_INST_DIR)/VTK/Common \
-I$(ParaView_INST_DIR)/VTK/Filtering \
-I$(ParaView_INST_DIR)/VTK/Rendering
LIB_LIBS = \ LIB_LIBS = \
$(GLIBS) $(GLIBS)
...@@ -65,8 +65,7 @@ esac ...@@ -65,8 +65,7 @@ esac
export ParaView_MAJOR export ParaView_MAJOR
export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION export ParaView_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION/platforms/$WM_ARCH$WM_COMPILER
export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
# add in python libraries if required # add in python libraries if required
......
...@@ -62,8 +62,7 @@ default: ...@@ -62,8 +62,7 @@ default:
endsw endsw
setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION setenv ParaView_DIR $WM_THIRD_PARTY_DIR/paraview-${ParaView_VERSION}/platforms/$WM_ARCH$WM_COMPILER
setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
# add in python libraries if required # add in python libraries if required
...@@ -76,7 +75,7 @@ if ( -r $paraviewPython ) then ...@@ -76,7 +75,7 @@ if ( -r $paraviewPython ) then
endif endif
endif endif
if ( -r $ParaView_INST_DIR ) then if ( -r $ParaView_DIR ) then
set path=($ParaView_DIR/bin $path) set path=($ParaView_DIR/bin $path)
setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-${ParaView_MAJOR} setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-${ParaView_MAJOR}
endif endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment