diff options
| -rw-r--r-- | libraries/VTK/README | 6 | ||||
| -rw-r--r-- | libraries/VTK/VTK.SlackBuild | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/libraries/VTK/README b/libraries/VTK/README index b352886970..07d290e2c9 100644 --- a/libraries/VTK/README +++ b/libraries/VTK/README @@ -29,3 +29,9 @@ QT=yes|no (default: yes) NB. Some combinations of options are known to result in compilation errors if the build machine already has VTK installed. Please remove any VTK installation before running the SlackBuild. + +When both Qt5 and Qt6 are installed, a particular QT version can be +set for the VTK build via the QTVERSION variable when running the +VTK.SlackBuild e.g. + QTVERSION=5 bash VTK.SlackBuild + diff --git a/libraries/VTK/VTK.SlackBuild b/libraries/VTK/VTK.SlackBuild index 4011628d35..8214625954 100644 --- a/libraries/VTK/VTK.SlackBuild +++ b/libraries/VTK/VTK.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=VTK VERSION=${VERSION:-9.4.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -86,6 +86,12 @@ netcdf="" #if test -e /usr/include/gl2ps.h ; then gl2ps="-DVTK_USE_SYSTEM_GL2PS:BOOL=ON" ; else gl2ps="" ; fi gl2ps="" +qtversion="-DVTK_QT_VERSION=Auto" +if [ "$QTVERSION" = "5" ]; then + qtversion="-DVTK_QT_VERSION=5" +elif [ "$QTVERSION" = "6" ]; then + qtversion="-DVTK_QT_VERSION=6" +fi set -e @@ -125,10 +131,10 @@ cd build -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ -DBUILD_SHARED_LIBS=ON \ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ - -DVTK_INSTALL_INCLUDE_DIR:PATH=include/VTK \ -DVTK_USE_TK=ON \ -DVTK_BUILD_EXAMPLES=ON \ -DINSTALL_DOCS=ON \ + $qtversion \ $group_imaging \ $group_mpi \ $group_qt \ |