From dc2418eb0d3464b8bff2351e04fb59ab1d83c912 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 3 Jan 2013 16:15:17 +0000
Subject: [PATCH] COMP: paraview: move include directory setting to paraview.sh
---
etc/config/example/paraview.csh | 4 ++--
etc/config/example/paraview.sh | 4 ++--
etc/config/paraview.csh | 3 ++-
etc/config/paraview.sh | 4 +++-
etc/config/unset.csh | 3 ++-
etc/config/unset.sh | 3 ++-
6 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/etc/config/example/paraview.csh b/etc/config/example/paraview.csh
index db45dd5965b..9b639c74ba3 100644
--- a/etc/config/example/paraview.csh
+++ b/etc/config/example/paraview.csh
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -39,7 +39,7 @@
#
set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode o config/paraview.csh`
-if ( $status == 0 ) source $foamFile ParaView_VERSION=3.9.0
+if ( $status == 0 ) source $foamFile ParaView_VERSION=3.12.0
unset foamFile
diff --git a/etc/config/example/paraview.sh b/etc/config/example/paraview.sh
index d0d13b55e0e..9586dc81dcd 100644
--- a/etc/config/example/paraview.sh
+++ b/etc/config/example/paraview.sh
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -39,7 +39,7 @@
#
foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o config/paraview.sh 2>/dev/null)
-[ $? -eq 0 ] && . $foamFile ParaView_VERSION=3.9.0
+[ $? -eq 0 ] && . $foamFile ParaView_VERSION=3.12.0
unset foamFile
diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh
index 7fa619881e9..3a011ee2192 100644
--- a/etc/config/paraview.csh
+++ b/etc/config/paraview.csh
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -88,6 +88,7 @@ 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 ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-${ParaView_MAJOR}
# add in python libraries if required
set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh
index a432e62c54a..9f35cdf3e4d 100644
--- a/etc/config/paraview.sh
+++ b/etc/config/paraview.sh
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -98,6 +98,8 @@ then
export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-$ParaView_MAJOR:$LD_LIBRARY_PATH
export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-$ParaView_MAJOR
+ export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-$ParaView_MAJOR
+
# add in python libraries if required
paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
if [ -r $paraviewPython ]
diff --git a/etc/config/unset.csh b/etc/config/unset.csh
index 555bd89d7bc..928f08f4422 100644
--- a/etc/config/unset.csh
+++ b/etc/config/unset.csh
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -125,6 +125,7 @@ unsetenv OPAL_PREFIX
unsetenv ENSIGHT9_READER
unsetenv CMAKE_HOME
unsetenv ParaView_DIR
+unsetenv ParaView_INCLUDE_DIR
unsetenv PV_PLUGIN_PATH
diff --git a/etc/config/unset.sh b/etc/config/unset.sh
index 3996a6df921..59428c5d6bb 100644
--- a/etc/config/unset.sh
+++ b/etc/config/unset.sh
@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@@ -112,6 +112,7 @@ unset OPAL_PREFIX
unset ENSIGHT9_READER
unset CMAKE_HOME
unset ParaView_DIR
+unset ParaView_INCLUDE_DIR
unset PV_PLUGIN_PATH
--
GitLab