diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt index ea50923e6a7528e5f987f7e5896211c864af6f2b..93dc9f702ef6899b14de013b222db6a32848f22a 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt @@ -14,6 +14,7 @@ INCLUDE(${PARAVIEW_USE_FILE}) LINK_DIRECTORIES( $ENV{FOAM_LIBBIN} + $ENV{FOAM_EXT_LIBBIN} ) INCLUDE_DIRECTORIES( diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/files b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/files index e71b857bb2e229412366860d8eaef07c1192bf3b..90ac11a3e8d1b040eac3f50e87be93b35aa1bfa9 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/files +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/files @@ -9,4 +9,4 @@ vtkPV3FoamMeshZone.C vtkPV3FoamUpdateInfo.C vtkPV3FoamUtils.C -LIB = $(FOAM_LIBBIN)/libvtkPV3Foam +LIB = $(FOAM_EXT_LIBBIN)/libvtkPV3Foam diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options index b10a420add997d2d9c932f410b943ab5f8a907ed..6d10cc1a05bceb1c5ccdcb66e377f22ba64f35fa 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options @@ -1,6 +1,6 @@ /* Note: enable vtkPolyhedron when available */ -PARAVIEW_INC=$(ParaView_DIR)/include/paraview-$(ParaView_MAJOR) +PARAVIEW_INC = $(ParaView_DIR)/include/paraview-$(ParaView_MAJOR) EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -15,9 +15,9 @@ EXE_INC = \ ) LIB_LIBS = \ - -lvtkPV3Readers \ -lmeshTools \ -lfiniteVolume \ -lgenericPatchFields \ -llagrangian \ + -L$(FOAM_EXT_LIBBIN) -lvtkPV3Readers \ $(GLIBS) diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt index 3376fa0d91caec4c8734f5d24626759caf8a64c5..f5d9f3f8678e3c7757de0a053cd7ac5bef58aa6c 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/PV3blockMeshReader/CMakeLists.txt @@ -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 diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/files b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/files index f084cc9f28fbc5faa5d02b2a857a9e4fc7f5eaf5..3d452f747a10e0ef24ab3166dd858a1f31dda161 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/files +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/files @@ -2,4 +2,4 @@ vtkPV3blockMesh.C vtkPV3blockMeshConvert.C vtkPV3blockMeshUtils.C -LIB = $(FOAM_LIBBIN)/libvtkPV3blockMesh +LIB = $(FOAM_EXT_LIBBIN)/libvtkPV3blockMesh diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options index 6001799a6c6646ffc2012e7db9623b02de98d0f3..1964824e54c7348e5c27582d82be8614ead694dc 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options @@ -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) diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/files b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/files index 134b8de963e813e2955fdac51ea10d5e684e6c94..c5f3c12ebd1700638c358ed7f95d99222663d9b6 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/files +++ b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/files @@ -1,3 +1,3 @@ vtkPV3Readers.C -LIB = $(FOAM_LIBBIN)/libvtkPV3Readers +LIB = $(FOAM_EXT_LIBBIN)/libvtkPV3Readers diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options index 55e559dd0502539268ec176477ca094d5da45db5..4b2b1a3289e26da1d003a99442cdc1c1e95aed02 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options +++ b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options @@ -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) diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc index 0be7e237196778ca07e577bc4c9d824360119f56..9e6c945d7b59b092d82248a0e8aa0afe82870dfd 100644 --- a/etc/apps/paraview3/bashrc +++ b/etc/apps/paraview3/bashrc @@ -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 diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc index dc52735480cfa8bea5284e3155697da67a922741..3fe22ecd09bda8812fa267af38c7c9c6f6438938 100644 --- a/etc/apps/paraview3/cshrc +++ b/etc/apps/paraview3/cshrc @@ -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