mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
ENH: relocate paraview plugins -> FOAM_EXT_LIBBIN
This commit is contained in:
@ -14,6 +14,7 @@ INCLUDE(${PARAVIEW_USE_FILE})
|
||||
|
||||
LINK_DIRECTORIES(
|
||||
$ENV{FOAM_LIBBIN}
|
||||
$ENV{FOAM_EXT_LIBBIN}
|
||||
)
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
|
||||
@ -9,4 +9,4 @@ vtkPV3FoamMeshZone.C
|
||||
vtkPV3FoamUpdateInfo.C
|
||||
vtkPV3FoamUtils.C
|
||||
|
||||
LIB = $(FOAM_LIBBIN)/libvtkPV3Foam
|
||||
LIB = $(FOAM_EXT_LIBBIN)/libvtkPV3Foam
|
||||
|
||||
@ -15,9 +15,9 @@ EXE_INC = \
|
||||
)
|
||||
|
||||
LIB_LIBS = \
|
||||
-lvtkPV3Readers \
|
||||
-lmeshTools \
|
||||
-lfiniteVolume \
|
||||
-lgenericPatchFields \
|
||||
-llagrangian \
|
||||
-L$(FOAM_EXT_LIBBIN) -lvtkPV3Readers \
|
||||
$(GLIBS)
|
||||
|
||||
@ -14,6 +14,7 @@ INCLUDE(${PARAVIEW_USE_FILE})
|
||||
|
||||
LINK_DIRECTORIES(
|
||||
$ENV{FOAM_LIBBIN}
|
||||
$ENV{FOAM_EXT_LIBBIN}
|
||||
)
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
@ -36,7 +37,8 @@ SET(
|
||||
#
|
||||
# Define combined plugin
|
||||
#
|
||||
# Try to extend the auto-generated panel
|
||||
|
||||
# Extend the auto-generated panel
|
||||
QT4_WRAP_CPP(MOC_SRCS pqPV3blockMeshReaderPanel.h)
|
||||
|
||||
ADD_PARAVIEW_OBJECT_PANEL(IFACES IFACE_SRCS
|
||||
|
||||
@ -2,4 +2,4 @@ vtkPV3blockMesh.C
|
||||
vtkPV3blockMeshConvert.C
|
||||
vtkPV3blockMeshUtils.C
|
||||
|
||||
LIB = $(FOAM_LIBBIN)/libvtkPV3blockMesh
|
||||
LIB = $(FOAM_EXT_LIBBIN)/libvtkPV3blockMesh
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
PARAVIEW_INC = $(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
|
||||
|
||||
EXE_INC = \
|
||||
-I$(LIB_SRC)/meshTools/lnInclude \
|
||||
-I$(LIB_SRC)/mesh/blockMesh/lnInclude \
|
||||
-I$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR) \
|
||||
-I$(PARAVIEW_INC) \
|
||||
-I../../vtkPV3Readers/lnInclude \
|
||||
-I../PV3blockMeshReader
|
||||
|
||||
LIB_LIBS = \
|
||||
-lvtkPV3Readers \
|
||||
-lmeshTools \
|
||||
-lblockMesh \
|
||||
-L$(FOAM_EXT_LIBBIN) -lvtkPV3Readers \
|
||||
$(GLIBS)
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
vtkPV3Readers.C
|
||||
|
||||
LIB = $(FOAM_LIBBIN)/libvtkPV3Readers
|
||||
LIB = $(FOAM_EXT_LIBBIN)/libvtkPV3Readers
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
PARAVIEW_INC = $(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
|
||||
|
||||
EXE_INC = \
|
||||
-I$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR)
|
||||
-I$(PARAVIEW_INC)
|
||||
|
||||
LIB_LIBS = \
|
||||
$(GLIBS)
|
||||
|
||||
@ -82,7 +82,7 @@ if [ -r $ParaView_DIR -o -r $paraviewInstDir ]
|
||||
then
|
||||
export PATH=$ParaView_DIR/bin:$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
|
||||
paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
|
||||
|
||||
@ -80,7 +80,7 @@ setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-
|
||||
if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
|
||||
setenv PATH ${ParaView_DIR}/bin:${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
|
||||
set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
|
||||
|
||||
Reference in New Issue
Block a user