summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Christoph Willing <chris.willing@iinet.net.au>2016-11-22 14:28:02 +1000
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-11-26 11:47:45 +0700
commit31038d3c842eadc25a56a7a4c8a8393c270c6374 (patch)
tree504663ddfd011008adefe5573c36d194320268ef
parent2d26a478ee992ae7c48ae828808820b695f5da6f (diff)
downloadslackbuilds-31038d3c842eadc25a56a7a4c8a8393c270c6374.tar.gz
slackbuilds-31038d3c842eadc25a56a7a4c8a8393c270c6374.tar.xz
libraries/VTK: Add qt5 option
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
-rw-r--r--libraries/VTK/README1
-rw-r--r--libraries/VTK/VTK.SlackBuild6
2 files changed, 6 insertions, 1 deletions
diff --git a/libraries/VTK/README b/libraries/VTK/README
index 1515bc81e1..966599f6e9 100644
--- a/libraries/VTK/README
+++ b/libraries/VTK/README
@@ -20,3 +20,4 @@ WEB=yes|no (default: no), requires python-twisted
JAVA=yes|no (default: no), requires jdk
PYTHON=yes|no (default: yes)
QT=yes|no (default: yes)
+VTKQT5=yes|no (default: no), requires qt5
diff --git a/libraries/VTK/VTK.SlackBuild b/libraries/VTK/VTK.SlackBuild
index 68dce971fe..f63d33d452 100644
--- a/libraries/VTK/VTK.SlackBuild
+++ b/libraries/VTK/VTK.SlackBuild
@@ -28,7 +28,7 @@
PRGNAM=VTK
VERSION=${VERSION:-7.1.0}
SHORT_VERSION=${SHORT_VERSION:-7.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -70,6 +70,9 @@ wrap_python="" ; [ "${PYTHON:-yes}" != "no" ] && wrap_python="-DVTK_WRAP_PYTH
wrap_java="" ; [ "${JAVA:-no}" != "no" ] && wrap_java="-DVTK_WRAP_JAVA=true"
wrap_tcl="" ; [ "${TCL:-yes}" != "no" ] && wrap_tcl="-DVTK_WRAP_TCL=true"
+# Also
+vtk_qt_version=""; [ "${VTKQT5:-no}" = "yes" ] && vtk_qt_version="-DVTK_QT_VERSION=5"
+
set -e
rm -rf $PKG
@@ -115,6 +118,7 @@ cd build
$wrap_python \
$wrap_java \
$wrap_tcl \
+ $vtk_qt_version \
-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-DVTK_USE_SYSTEM_JPEG:BOOL=ON \