Commit 91cfaa52 authored by Andrew Heather's avatar Andrew Heather
Browse files

GIT: Initial state after latest Foundation merge

parent b7e13883
......@@ -41,19 +41,25 @@ canBuildPlugin()
# -----------------------------------------------------------------------------
case "$ParaView_VERSION" in
3*)
if canBuildPlugin
then
(
# ensure CMake gets the correct C/C++ compilers
[ -n "$PV_PLUGIN_PATH" ] || {
echo "$0 : PV_PLUGIN_PATH not valid - it is unset"
exit 1
}
# Ensure CMake gets the correct C/C++ compilers
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
wmake $targetType vtkPV3Readers
PV3blockMeshReader/Allwmake $targetType $*
PV3FoamReader/Allwmake $targetType $*
)
else
echo "ERROR: ParaView not found in $ParaView_DIR"
fi
;;
*)
......@@ -64,4 +70,5 @@ case "$ParaView_VERSION" in
;;
esac
#------------------------------------------------------------------------------
......@@ -41,11 +41,16 @@ canBuildPlugin()
# -----------------------------------------------------------------------------
case "$ParaView_VERSION" in
4* | 5*)
if canBuildPlugin
then
(
[ -n "$PV_PLUGIN_PATH" ] || {
echo "$0 : PV_PLUGIN_PATH not valid - it is unset"
exit 1
}
# ensure CMake gets the correct C/C++ compilers
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
......@@ -54,10 +59,11 @@ case "$ParaView_VERSION" in
PVblockMeshReader/Allwmake $targetType $*
PVFoamReader/Allwmake $targetType $*
# dummy directory to trigger proper 'wclean all' behaviour
# Dummy directory to trigger proper 'wclean all' behaviour
# - the Allwclean will otherwise not be used
mkdir -p Make
)
else
echo "ERROR: ParaView not found in $ParaView_DIR"
fi
;;
*)
......@@ -68,4 +74,5 @@ case "$ParaView_VERSION" in
;;
esac
#------------------------------------------------------------------------------
......@@ -15,10 +15,11 @@ set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then
wmake $targetType vtkPVFoam
sourceDir=$PWD/PVFoamReader
if [ "$targetType" != "objects" ]
then
sourceDir=$PWD/PVFoamReader
# Where are any generated files stored?
findObjectDir $sourceDir
(
......
# create a plugin that adds a reader to the ParaView GUI
# Create a plugin that adds a reader to the ParaView GUI
# it is added in the file dialog when doing opens/saves.
# The qrc file is processed by Qt's resource compiler (rcc)
......
......@@ -9,8 +9,7 @@ EXE_INC = \
-I../PVFoamReader
LIB_LIBS = \
-lmeshTools \
-lfiniteVolume \
-ldynamicMesh \
-ldynamicMesh \
-lgenericPatchFields \
-llagrangian \
......
......@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source the wmake functions
. $WM_DIR/scripts/wmakeFunctions
# ensure CMake gets the correct C/C++ compilers
# Ensure CMake gets the correct C/C++ compilers
[ -n "$WM_CC" ] && export CC="$WM_CC"
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
......@@ -15,10 +15,11 @@ set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then
wmake $targetType vtkPVblockMesh
sourceDir=$PWD/PVblockMeshReader
if [ "$targetType" != "objects" ]
then
sourceDir=$PWD/PVblockMeshReader
# Where are any generated files stored?
findObjectDir $sourceDir
(
......
Markdown is supported
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