svn commit: r465054 - head/math/vtk6
Stephen Montgomery-Smith
stephen at FreeBSD.org
Tue Mar 20 02:19:22 UTC 2018
Author: stephen
Date: Tue Mar 20 02:19:21 2018
New Revision: 465054
URL: https://svnweb.freebsd.org/changeset/ports/465054
Log:
- Fix make install error when compiling with QT5 enabled.
PR: ports/226752
Submitted by: otacilio.neto at bsd.com.br
Modified:
head/math/vtk6/Makefile
head/math/vtk6/pkg-plist
Modified: head/math/vtk6/Makefile
==============================================================================
--- head/math/vtk6/Makefile Tue Mar 20 01:31:29 2018 (r465053)
+++ head/math/vtk6/Makefile Tue Mar 20 02:19:21 2018 (r465054)
@@ -130,6 +130,7 @@ USE_QT4= gui_build gui_run network_build network_run s
moc_build uic_build qmake_build rcc_build opengl webkit_build \
webkit_run
CMAKE_ARGS+= -DVTK_QT_VERSION:STRING="4"
+PLIST_SUB+= QTV="qt4"
.endif
.if ${PORT_OPTIONS:MQT5}
@@ -137,6 +138,7 @@ USE_QT5= gui_build gui_run network_build network_run s
qmake_build opengl webkit_build buildtools webkit_run
CMAKE_ARGS+= -DVTK_QT_VERSION:STRING="5" \
-DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5
+PLIST_SUB+= QTV="qt5"
.endif
.if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5}
Modified: head/math/vtk6/pkg-plist
==============================================================================
--- head/math/vtk6/pkg-plist Tue Mar 20 01:31:29 2018 (r465053)
+++ head/math/vtk6/pkg-plist Tue Mar 20 02:19:21 2018 (r465054)
@@ -825,7 +825,7 @@
%%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkGUISupportQtWebkit.cmake
%%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkRenderingQt.cmake
%%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkViewsQt.cmake
-%%SHARED%%%%DESIGNER%%lib/qt4/plugins/designer/libQVTKWidgetPlugin-%%VER2%%.so
+%%SHARED%%%%DESIGNER%%lib/%%QTV%%/plugins/designer/libQVTKWidgetPlugin-%%VER2%%.so
%%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkFiltersParallelGeometryJava.so
%%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkFiltersParallelMPIJava.so
%%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkIOMPIImageJava.so
More information about the svn-ports-all
mailing list