Commit 46a58658 authored by Mark Olesen's avatar Mark Olesen
Browse files

ENH: relocate paraview plugins -> FOAM_EXT_LIBBIN

parent 171d7a35
...@@ -14,6 +14,7 @@ INCLUDE(${PARAVIEW_USE_FILE}) ...@@ -14,6 +14,7 @@ INCLUDE(${PARAVIEW_USE_FILE})
LINK_DIRECTORIES( LINK_DIRECTORIES(
$ENV{FOAM_LIBBIN} $ENV{FOAM_LIBBIN}
$ENV{FOAM_EXT_LIBBIN}
) )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
......
...@@ -9,4 +9,4 @@ vtkPV3FoamMeshZone.C ...@@ -9,4 +9,4 @@ vtkPV3FoamMeshZone.C
vtkPV3FoamUpdateInfo.C vtkPV3FoamUpdateInfo.C
vtkPV3FoamUtils.C vtkPV3FoamUtils.C
LIB = $(FOAM_LIBBIN)/libvtkPV3Foam LIB = $(FOAM_EXT_LIBBIN)/libvtkPV3Foam
/* Note: enable vtkPolyhedron when available */ /* Note: enable vtkPolyhedron when available */
PARAVIEW_INC=$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR) PARAVIEW_INC = $(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
...@@ -15,9 +15,9 @@ EXE_INC = \ ...@@ -15,9 +15,9 @@ EXE_INC = \
) )
LIB_LIBS = \ LIB_LIBS = \
-lvtkPV3Readers \
-lmeshTools \ -lmeshTools \
-lfiniteVolume \ -lfiniteVolume \
-lgenericPatchFields \ -lgenericPatchFields \
-llagrangian \ -llagrangian \
-L$(FOAM_EXT_LIBBIN) -lvtkPV3Readers \
$(GLIBS) $(GLIBS)
...@@ -14,6 +14,7 @@ INCLUDE(${PARAVIEW_USE_FILE}) ...@@ -14,6 +14,7 @@ INCLUDE(${PARAVIEW_USE_FILE})
LINK_DIRECTORIES( LINK_DIRECTORIES(
$ENV{FOAM_LIBBIN} $ENV{FOAM_LIBBIN}
$ENV{FOAM_EXT_LIBBIN}
) )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
...@@ -36,7 +37,8 @@ SET( ...@@ -36,7 +37,8 @@ SET(
# #
# Define combined plugin # Define combined plugin
# #
# Try to extend the auto-generated panel
# Extend the auto-generated panel
QT4_WRAP_CPP(MOC_SRCS pqPV3blockMeshReaderPanel.h) QT4_WRAP_CPP(MOC_SRCS pqPV3blockMeshReaderPanel.h)
ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
......
...@@ -2,4 +2,4 @@ vtkPV3blockMesh.C ...@@ -2,4 +2,4 @@ vtkPV3blockMesh.C
vtkPV3blockMeshConvert.C vtkPV3blockMeshConvert.C
vtkPV3blockMeshUtils.C vtkPV3blockMeshUtils.C
LIB = $(FOAM_LIBBIN)/libvtkPV3blockMesh LIB = $(FOAM_EXT_LIBBIN)/libvtkPV3blockMesh
PARAVIEW_INC = $(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
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)/include/paraview-$(ParaView_MAJOR) \ -I$(PARAVIEW_INC) \
-I../../vtkPV3Readers/lnInclude \ -I../../vtkPV3Readers/lnInclude \
-I../PV3blockMeshReader -I../PV3blockMeshReader
LIB_LIBS = \ LIB_LIBS = \
-lvtkPV3Readers \
-lmeshTools \ -lmeshTools \
-lblockMesh \ -lblockMesh \
-L$(FOAM_EXT_LIBBIN) -lvtkPV3Readers \
$(GLIBS) $(GLIBS)
vtkPV3Readers.C vtkPV3Readers.C
LIB = $(FOAM_LIBBIN)/libvtkPV3Readers LIB = $(FOAM_EXT_LIBBIN)/libvtkPV3Readers
PARAVIEW_INC = $(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
EXE_INC = \ EXE_INC = \
-I$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR) -I$(PARAVIEW_INC)
LIB_LIBS = \ LIB_LIBS = \
$(GLIBS) $(GLIBS)
...@@ -82,7 +82,7 @@ if [ -r $ParaView_DIR -o -r $paraviewInstDir ] ...@@ -82,7 +82,7 @@ if [ -r $ParaView_DIR -o -r $paraviewInstDir ]
then then
export PATH=$ParaView_DIR/bin:$PATH export PATH=$ParaView_DIR/bin:$PATH
export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-$ParaView_MAJOR:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-$ParaView_MAJOR:$LD_LIBRARY_PATH
export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-$ParaView_MAJOR export PV_PLUGIN_PATH=$FOAM_EXT_LIBBIN/paraview-$ParaView_MAJOR
# add in python libraries if required # add in python libraries if required
paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
......
...@@ -80,7 +80,7 @@ setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview- ...@@ -80,7 +80,7 @@ setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-
if ( -r $ParaView_DIR || -r $paraviewInstDir ) then if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
setenv PATH ${ParaView_DIR}/bin:${PATH} setenv PATH ${ParaView_DIR}/bin:${PATH}
setenv LD_LIBRARY_PATH "${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}:${LD_LIBRARY_PATH}" setenv LD_LIBRARY_PATH "${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}:${LD_LIBRARY_PATH}"
setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-${ParaView_MAJOR} setenv PV_PLUGIN_PATH $FOAM_EXT_LIBBIN/paraview-${ParaView_MAJOR}
# add in python libraries if required # add in python libraries if required
set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment