File paraview-pythonqt-build-fix.patch of Package paraview

Overview Repositories Revisions Requests Users Attributes Meta

File paraview-pythonqt-build-fix.patch of Package paraview (Revision 621c1dd18d48a311286d71f51fc987f5)

Currently displaying revision 621c1dd18d48a311286d71f51fc987f5 , Show latest

From 1cdde87a94d4282279337a9e7079f34d7a9b64cf Mon Sep 17 00:00:00 2001
From: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Date: Thu, 17 Nov 2016 11:07:35 -0500
Subject: [PATCH] Fix build issues with PythonQtPlugin.

---
 Plugins/PythonQtPlugin/CMakeLists.txt | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

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
-- 
2.7.4

Places

File paraview-pythonqt-build-fix.patch of Package paraview (Revision 621c1dd18d48a311286d71f51fc987f5)

Places