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.
This commit is contained in:
parent
d966430771
commit
10524cb8a1
@ -2,12 +2,7 @@ EXE_INC = \
|
||||
-I$(LIB_SRC)/meshTools/lnInclude \
|
||||
-I$(LIB_SRC)/finiteVolume/lnInclude \
|
||||
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
|
||||
-I$(ParaView_DIR)/VTK \
|
||||
-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$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR) \
|
||||
-I../../vtkPV3Readers/lnInclude \
|
||||
-I../PV3FoamReader
|
||||
|
||||
|
@ -1,12 +1,7 @@
|
||||
EXE_INC = \
|
||||
-I$(LIB_SRC)/meshTools/lnInclude \
|
||||
-I$(LIB_SRC)/mesh/blockMesh/lnInclude \
|
||||
-I$(ParaView_DIR)/VTK \
|
||||
-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$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR) \
|
||||
-I../../vtkPV3Readers/lnInclude \
|
||||
-I../PV3blockMeshReader
|
||||
|
||||
|
@ -1,10 +1,5 @@
|
||||
EXE_INC = \
|
||||
-I$(ParaView_DIR)/VTK \
|
||||
-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$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
|
||||
|
||||
LIB_LIBS = \
|
||||
$(GLIBS)
|
||||
|
@ -65,8 +65,7 @@ esac
|
||||
export ParaView_MAJOR
|
||||
|
||||
|
||||
export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
|
||||
export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
|
||||
export ParaView_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION/platforms/$WM_ARCH$WM_COMPILER
|
||||
|
||||
|
||||
# add in python libraries if required
|
||||
|
@ -62,8 +62,7 @@ default:
|
||||
endsw
|
||||
|
||||
|
||||
setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
|
||||
setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
|
||||
setenv ParaView_DIR $WM_THIRD_PARTY_DIR/paraview-${ParaView_VERSION}/platforms/$WM_ARCH$WM_COMPILER
|
||||
|
||||
|
||||
# add in python libraries if required
|
||||
@ -76,7 +75,7 @@ if ( -r $paraviewPython ) then
|
||||
endif
|
||||
endif
|
||||
|
||||
if ( -r $ParaView_INST_DIR ) then
|
||||
if ( -r $ParaView_DIR ) then
|
||||
set path=($ParaView_DIR/bin $path)
|
||||
setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-${ParaView_MAJOR}
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user