Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
ThirdParty-common
Commits
54efaa44
Commit
54efaa44
authored
Jun 11, 2018
by
Mark OLESEN
Browse files
STYLE: additional comments about suffixes
- strip both prefix and suffix for VTK and ParaView builds
parent
dab3042c
Changes
3
Hide whitespace changes
Inline
Side-by-side
makeParaView
View file @
54efaa44
...
...
@@ -47,7 +47,13 @@ then
fi
unset
ParaView_DIR ParaView_INCLUDE_DIR PV_PLUGIN_PATH
ParaView_VERSION
=
"
${
ParaView_VERSION
##*-
}
"
# Without prefix
case
"
$ParaView_VERSION
"
in
[
Pp]
*
)
ParaView_VERSION
=
"
${
ParaView_VERSION
##*-
}
"
# Without "ParaView-" prefix
;;
esac
ParaView_VERSION
=
"
${
ParaView_VERSION
%%-*
}
"
# Without suffix (eg, -python)
# Set initial ParaView_MAJOR based on current value of ParaView_VERSION
setParaViewVersion
${
ParaView_VERSION
:-
none
}
...
...
makeParaView.example
View file @
54efaa44
...
...
@@ -2,6 +2,10 @@
# An example for building particular combinations of ParaView with
# - mpi (0 = no upper-limit on processes)
# - mesa
# - python (required for Catalyst)
#
# NOTE: must modify etc/config.*/paraview to use this particular version
# and combination, or use chaining as per etc/config.*/example/paraview
# mesa=mesa-11.2.2
# mesa=mesa-13.0.3
...
...
@@ -11,7 +15,8 @@ set -x
./makeParaView
\
-mpi
=
0
\
-mesa-prefix
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER
/
$mesa
\
-suffix
mesa
\
-python
\
-suffix
mesa-mpi-py
\
"
$@
"
#------------------------------------------------------------------------------
makeVTK
View file @
54efaa44
...
...
@@ -42,7 +42,15 @@ unset vtk_version mesa_version # Purge current values
# vtk version from OpenFOAM etc/config.sh file:
_foamEtc
-config
vtk
VTK_VERSION
=
"
${
vtk_version
##*-
}
"
# Without prefix
VTK_VERSION
=
"
$vtk_version
"
case
"
$VTK_VERSION
"
in
[
Vv]
*
)
VTK_VERSION
=
"
${
VTK_VERSION
##*-
}
"
# Without "VTK-" prefix
;;
esac
VTK_VERSION
=
"
${
VTK_VERSION
%%-*
}
"
# Without suffix (eg, -mesa)
# New rendering backend (starting with vtk 7?).
withGL2
=
auto
# auto-config based on version
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment