From 10524cb8a196349ea707d0a0c3de0efdfb0210f5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 5 Mar 2010 13:04:30 +0100
Subject: [PATCH] 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.
---
.../PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options | 7 +------
.../PV3blockMeshReader/vtkPV3blockMesh/Make/options | 7 +------
.../graphics/PV3Readers/vtkPV3Readers/Make/options | 7 +------
etc/apps/paraview3/bashrc | 3 +--
etc/apps/paraview3/cshrc | 5 ++---
5 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options
index d58afde30bd..48e0c4a9a3c 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/Make/options
@@ -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
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options
index 5d19916934a..6001799a6c6 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/Make/options
@@ -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
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options
index 876a3e334ed..55e559dd050 100644
--- a/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/vtkPV3Readers/Make/options
@@ -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)
diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc
index d16446bfe62..545fa7a793f 100644
--- a/etc/apps/paraview3/bashrc
+++ b/etc/apps/paraview3/bashrc
@@ -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
diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc
index 490f432e6c6..90d0648fd43 100644
--- a/etc/apps/paraview3/cshrc
+++ b/etc/apps/paraview3/cshrc
@@ -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
--
GitLab