From 80c33578d796321a41b845a9228b8c53286b5bee Mon Sep 17 00:00:00 2001 From: jfd Date: Thu, 13 Feb 2020 14:31:38 -0800 Subject: [PATCH 1/6] add feature build vtk[qtopengl] --- ports/vtk/CONTROL | 8 ++++++-- ports/vtk/portfile.cmake | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index e8693b06e764d9..0271886d8288d5 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -2,7 +2,7 @@ Source: vtk Version: 8.2.0-11 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c, qt5 Feature: openvr Description: OpenVR functionality for VTK @@ -22,4 +22,8 @@ Build-Depends: python3 Feature: atlmfc Description: Mfc functionality for vtk on Windows -Build-Depends: atlmfc (windows) \ No newline at end of file +Build-Depends: atlmfc (windows) + +Feature: qtopengl +Description: OpenGL with Qt for vtk on Windows +Build-Depends: qt5 diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 4ddfb533482055..2c6fcb74273ac2 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -10,6 +10,7 @@ set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0") # Options: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS qt VTK_WITH_QT + qtopengl VTK_WITH_QT_OPENGL mpi VTK_Group_MPI python VTK_WITH_PYTHON openvr Module_vtkRenderingOpenVR @@ -49,9 +50,20 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/CM # ============================================================================= # Collect CMake options for optional components +if(VTK_WITH_QT_OPENGL) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_Group_Qt=ON + -DvtkGUISupportQtOpenGL=ON + -DModule_vtkGUISupportQtOpenGL=ON + -DVTK_QT_VERSION=5 + -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF + ) +endif() + if(VTK_WITH_QT) list(APPEND ADDITIONAL_OPTIONS -DVTK_Group_Qt=ON + -DvtkGUISupportQtOpenGL=ON -DVTK_QT_VERSION=5 -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF ) @@ -108,6 +120,9 @@ vcpkg_configure_cmake( # Select modules / groups to install -DVTK_Group_Imaging=ON + -DVTK_LEGACY_SILENT=ON + -DModule_vtkGUISupportQt=ON + -DModule_vtkGUISupportQtOpenGL=ON -DVTK_Group_Views=ON -DPYTHON_EXECUTABLE=${PYTHON3} From 993267bc3e78bd0c4a3adbe474b2a1a8401b171c Mon Sep 17 00:00:00 2001 From: jfd Date: Fri, 14 Feb 2020 15:23:01 -0800 Subject: [PATCH 2/6] fixes after codereview with @Neumann-A --- ports/vtk/CONTROL | 5 +++-- ports/vtk/portfile.cmake | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 0271886d8288d5..aa53887a9b7b2b 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -2,7 +2,7 @@ Source: vtk Version: 8.2.0-11 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c, qt5 +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c Feature: openvr Description: OpenVR functionality for VTK @@ -26,4 +26,5 @@ Build-Depends: atlmfc (windows) Feature: qtopengl Description: OpenGL with Qt for vtk on Windows -Build-Depends: qt5 +Build-Depends: qt5-base, qt5-tools, vtk[core] + diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 2c6fcb74273ac2..30c28f0714ffa2 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -63,7 +63,6 @@ endif() if(VTK_WITH_QT) list(APPEND ADDITIONAL_OPTIONS -DVTK_Group_Qt=ON - -DvtkGUISupportQtOpenGL=ON -DVTK_QT_VERSION=5 -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF ) From 415ac9ef8b57d5152a54b7120b71f5ce8a99b877 Mon Sep 17 00:00:00 2001 From: jfd Date: Fri, 27 Mar 2020 12:51:58 -0700 Subject: [PATCH 3/6] initial working version for QVTKOpenGLWidget --- ports/vtk/CONTROL | 10 +++++++--- ports/vtk/portfile.cmake | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index e8693b06e764d9..6bd0d3c76c1a4a 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -2,7 +2,7 @@ Source: vtk Version: 8.2.0-11 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c, qt5 Feature: openvr Description: OpenVR functionality for VTK @@ -21,5 +21,9 @@ Description: Python functionality for VTK Build-Depends: python3 Feature: atlmfc -Description: Mfc functionality for vtk on Windows -Build-Depends: atlmfc (windows) \ No newline at end of file +Description: Mfc functionality for VTK on Windows +Build-Depends: atlmfc (windows) + +Feature: qtopengl +Description: OpenGL with Qt for VTK on Windows +Build-Depends: qt5 diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 4743c65205be1a..993e94833e3c91 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -8,6 +8,7 @@ set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0") # Options: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS qt VTK_WITH_QT + qtopengl VTK_WITH_QT_OPENGL mpi VTK_Group_MPI python VTK_WITH_PYTHON openvr Module_vtkRenderingOpenVR @@ -47,9 +48,20 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/CM # ============================================================================= # Collect CMake options for optional components +if(VTK_WITH_QT_OPENGL) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_Group_Qt=ON + -DvtkGUISupportQtOpenGL=ON + -DModule_vtkGUISupportQtOpenGL=ON + -DVTK_QT_VERSION=5 + -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF + ) +endif() + if(VTK_WITH_QT) list(APPEND ADDITIONAL_OPTIONS -DVTK_Group_Qt=ON + -DvtkGUISupportQtOpenGL=ON -DVTK_QT_VERSION=5 -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF ) @@ -110,6 +122,9 @@ vcpkg_configure_cmake( # Select modules / groups to install -DVTK_Group_Imaging=ON + -DVTK_LEGACY_SILENT=ON + -DModule_vtkGUISupportQt=ON + -DModule_vtkGUISupportQtOpenGL=ON -DVTK_Group_Views=ON -DPYTHON_EXECUTABLE=${PYTHON3} From 3f9925316c8dc8ab75d964031b85294e5bf9b526 Mon Sep 17 00:00:00 2001 From: jfd Date: Fri, 27 Mar 2020 13:27:58 -0700 Subject: [PATCH 4/6] list qt5-tools first for qtopengl --- ports/vtk/CONTROL | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index aa53887a9b7b2b..a6cb156ec8d984 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -21,10 +21,11 @@ Description: Python functionality for VTK Build-Depends: python3 Feature: atlmfc -Description: Mfc functionality for vtk on Windows +Description: Mfc functionality for VTK on Windows Build-Depends: atlmfc (windows) Feature: qtopengl Description: OpenGL with Qt for vtk on Windows -Build-Depends: qt5-base, qt5-tools, vtk[core] +Build-Depends: qt5-tools, qt5-base, vtk[core] + From 176ec4d8454c774766e994e7809a72c72de26424 Mon Sep 17 00:00:00 2001 From: jfd Date: Thu, 9 Apr 2020 10:04:19 -0700 Subject: [PATCH 5/6] take two, list all of qt as dependency --- ports/vtk/CONTROL | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 64ea7967205fb2..ff0e32d1080df3 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -25,7 +25,5 @@ Description: Mfc functionality for VTK on Windows Build-Depends: atlmfc (windows) Feature: qtopengl -Description: OpenGL with Qt for vtk on Windows -Build-Depends: qt5-tools, qt5-base, vtk[core] - - +Description: OpenGL with Qt for VTK on Windows +Build-Depends: qt5,vtk[core] From 8a01ba87da94b2662b1e8e1455c4fa2abc9c8372 Mon Sep 17 00:00:00 2001 From: jfd Date: Mon, 13 Apr 2020 13:14:31 -0700 Subject: [PATCH 6/6] take 3 --- ports/vtk/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index ff0e32d1080df3..4e09677e850adb 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -2,7 +2,7 @@ Source: vtk Version: 8.2.0-12 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c, qt5 Feature: openvr Description: OpenVR functionality for VTK