From 03766d0834c1ca8dea25ffafbe4fe1c60786a412 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Tue, 23 Jun 2020 19:20:18 +0200
Subject: [CGNS/ParaView] Add new ports (#9960)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [cgns] add port cgns

* [paraview] add new port

* [paraview] correct dependencies; disable catalyst

* [VTK/ParaView] Make ParaView build

* [paraview] add missing patch

* [paraview] add cgns patch

* [paraview] add qt plugin patches back in. Remove in the future

* [vtk] slightly improved patches

* [vtk] don't disable findPython

* [paraview] add more features

* [paraview] remove X11Extras from OSX

* [vtk] make vtk workcorrectly with python and prepare for paraview with python

* [paraview] Python fixes

* [paraview] small bin -> lib replacement fix for static builds

* [vtk] fix patch path

* update baseline to exclude paraview for the time being on osx and linux.
requires a fix in qt5-base linkage of libpq.

* [paraview]try setting LD_LIBRARY_PATH for unix systems

* [paraview] a bit of cleanup

* update baseline

* fix typo in baseline

* [paraview] remove unnecessary patch

* [vtk] replace custom patch with upstream patch

* [paraview] cleanup in the portfile.

* Update ports/paraview/CONTROL

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
---
 ports/vtk/pythonwrapper.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'ports/vtk/pythonwrapper.patch')

diff --git a/ports/vtk/pythonwrapper.patch b/ports/vtk/pythonwrapper.patch
index d7585cf0f..6cdd4162a 100644
--- a/ports/vtk/pythonwrapper.patch
+++ b/ports/vtk/pythonwrapper.patch
@@ -2,7 +2,8 @@ diff --git a/CMake/vtkModuleWrapPython.cmake b/CMake/vtkModuleWrapPython.cmake
 index 5d2c2e1bf..e33a16d68 100644
 --- a/CMake/vtkModuleWrapPython.cmake
 +++ b/CMake/vtkModuleWrapPython.cmake
-@@ -75,10 +75,13 @@ function (_vtk_module_wrap_python_sources module sources classes)
+@@ -152,11 +152,14 @@ function (_vtk_module_wrap_python_sources module sources classes)
+   set(_vtk_python_genex_compile_definitions
      "$<TARGET_PROPERTY:${_vtk_python_target_name},COMPILE_DEFINITIONS>")
    set(_vtk_python_genex_include_directories
      "$<TARGET_PROPERTY:${_vtk_python_target_name},INCLUDE_DIRECTORIES>")
@@ -11,9 +12,8 @@ index 5d2c2e1bf..e33a16d68 100644
    file(GENERATE
      OUTPUT  "${_vtk_python_args_file}"
      CONTENT "$<$<BOOL:${_vtk_python_genex_compile_definitions}>:\n-D\'$<JOIN:${_vtk_python_genex_compile_definitions},\'\n-D\'>\'>\n
--$<$<BOOL:${_vtk_python_genex_include_directories}>:\n-I\'$<JOIN:${_vtk_python_genex_include_directories},\'\n-I\'>\'>\n")
-+$<$<BOOL:${_vtk_python_genex_include_directories}>:\n-I\'$<JOIN:${_vtk_python_genex_include_directories},\'\n-I\'>\'>\n
-+$<$<BOOL:${_vtk_python_genex_interface_include_directories}>:\n-I\'$<JOIN:${_vtk_python_genex_interface_include_directories},\'\n-I\'>\'>\n")
+ $<$<BOOL:${_vtk_python_genex_include_directories}>:\n-I\'$<JOIN:${_vtk_python_genex_include_directories},\'\n-I\'>\'>\n
++$<$<BOOL:${_vtk_python_genex_interface_include_directories}>:\n-I\'$<JOIN:${_vtk_python_genex_interface_include_directories},\'\n-I\'>\'>\n
+ $<$<BOOL:${_vtk_python_hierarchy_files}>:\n--types \'$<JOIN:${_vtk_python_hierarchy_files},\'\n--types \'>\'>\n")
  
-   _vtk_module_get_module_property("${module}"
-     PROPERTY  "hierarchy"
+   set(_vtk_python_sources)
-- 
cgit v1.2.3