diff options
| author | Christoph Willing <chris.willing@iinet.net.au> | 2016-11-19 09:04:10 +1000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-11-19 07:31:18 +0700 |
| commit | 1c05aebc821fe76d4c2ef34c16958376b5e219eb (patch) | |
| tree | 2367a83dd80071b383ed8d436507265f076d84ed /graphics/paraview/1201.diff | |
| parent | 5d9e349319e5f20000643e301a941e524862ab57 (diff) | |
| download | slackbuilds-1c05aebc821fe76d4c2ef34c16958376b5e219eb.tar.gz | |
graphics/paraview: Updated for version 5.2.0
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
Diffstat (limited to 'graphics/paraview/1201.diff')
| -rw-r--r-- | graphics/paraview/1201.diff | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/graphics/paraview/1201.diff b/graphics/paraview/1201.diff new file mode 100644 index 0000000000..04b5345de6 --- /dev/null +++ b/graphics/paraview/1201.diff @@ -0,0 +1,35 @@ +# Upstream patch to fix building of PythonQt plugin. +# From http://gitlab.kitware.com/paraview/paraview/merge_requests/1201/diffs +# +diff --git a/Plugins/PythonQtPlugin/CMakeLists.txt b/Plugins/PythonQtPlugin/CMakeLists.txt +index d87853b..d249961 100644 +--- a/Plugins/PythonQtPlugin/CMakeLists.txt ++++ b/Plugins/PythonQtPlugin/CMakeLists.txt +@@ -7,6 +7,8 @@ else() + include(${PARAVIEW_USE_FILE}) + endif() + ++include(ParaViewQt) ++pv_find_package_qt(qt_targets REQUIRED QT4_COMPONENTS QtGui QT5_COMPONENTS Widgets) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}) + find_package(PythonQt REQUIRED) +@@ -23,17 +25,7 @@ set(PythonQtPlugin_MOC_SRCS + pqPythonEventFilter.h + ) + +-if (PARAVIEW_QT_VERSION VERSION_GREATER "4") +- qt5_wrap_cpp(MOC_SRCS +- ${PythonQtPlugin_MOC_SRCS} +- ${decorator_file} +- ) +-else () +- qt4_wrap_cpp(MOC_SRCS +- ${PythonQtPlugin_MOC_SRCS} +- ${decorator_file} +- ) +-endif () ++pv_qt_wrap_cpp(MOC_SRCS ${PythonQtPlugin_MOC_SRCS} ${decorator_file}) + + set(srcs + pqPythonQtPlugin.cxx |