Commit 3198ecc4 authored by Clinton Stimpson's avatar Clinton Stimpson
Browse files

Fix Qt python wrapping when Infovis/Views is off.

Change-Id: I7742bd09f424f30862a5b49f4df508dfe643c6df
parent 11f7e3bb
...@@ -195,17 +195,22 @@ if(VTK_WRAP_PYTHON_SIP) ...@@ -195,17 +195,22 @@ if(VTK_WRAP_PYTHON_SIP)
set(QVTK_PythonHeaders set(QVTK_PythonHeaders
QVTKInteractor.h QVTKInteractor.h
vtkEventQtSlotConnect.h vtkEventQtSlotConnect.h
vtkQtAnnotationView.h
vtkQtListView.h
vtkQtSQLDatabase.h vtkQtSQLDatabase.h
vtkQtSQLQuery.h vtkQtSQLQuery.h
vtkQtRecordView.h
vtkQtTableRepresentation.h
vtkQtTableView.h
vtkQtTimePointUtility.h vtkQtTimePointUtility.h
vtkQtTreeView.h
vtkQtView.h
) )
if(VTK_USE_VIEWS)
set(QVTK_PythonHeaders ${QVTK_PythonHeaders}
vtkQtAnnotationView.h
vtkQtListView.h
vtkQtRecordView.h
vtkQtTableRepresentation.h
vtkQtTableView.h
vtkQtTreeView.h
vtkQtView.h
)
endif(VTK_USE_VIEWS)
if(VTK_USE_QTCHARTS) if(VTK_USE_QTCHARTS)
set(QVTK_PythonHeaders ${QVTK_PythonHeaders} set(QVTK_PythonHeaders ${QVTK_PythonHeaders}
vtkQtBarChartView.h vtkQtBarChartView.h
...@@ -216,11 +221,11 @@ if(VTK_WRAP_PYTHON_SIP) ...@@ -216,11 +221,11 @@ if(VTK_WRAP_PYTHON_SIP)
vtkQtStatisticalBoxChartView.h vtkQtStatisticalBoxChartView.h
) )
endif() endif()
IF(VTK_QT_USE_WEBKIT) IF(VTK_USE_VIEWS AND VTK_QT_USE_WEBKIT)
set(QVTK_PythonHeaders ${QVTK_PythonHeaders} set(QVTK_PythonHeaders ${QVTK_PythonHeaders}
vtkQtRichTextView.h vtkQtRichTextView.h
) )
ENDIF(VTK_QT_USE_WEBKIT) ENDIF(VTK_USE_VIEWS AND VTK_QT_USE_WEBKIT)
# GUISupport/Qt doesn't have a hierarchy file, use Rendering # GUISupport/Qt doesn't have a hierarchy file, use Rendering
IF(VTK_IGNORE_BTX) IF(VTK_IGNORE_BTX)
...@@ -230,7 +235,11 @@ if(VTK_WRAP_PYTHON_SIP) ...@@ -230,7 +235,11 @@ if(VTK_WRAP_PYTHON_SIP)
VTK_WRAP_PYTHON3(vtkQtPython QVTK_PythonSrcs "${QVTK_PythonHeaders}") VTK_WRAP_PYTHON3(vtkQtPython QVTK_PythonSrcs "${QVTK_PythonHeaders}")
VTK_ADD_LIBRARY(vtkQtPythonD ${QVTK_PythonSrcs}) VTK_ADD_LIBRARY(vtkQtPythonD ${QVTK_PythonSrcs})
TARGET_LINK_LIBRARIES(vtkQtPythonD QVTK vtkViewsPythonD vtkRenderingPythonD vtkPythonCore) TARGET_LINK_LIBRARIES(vtkQtPythonD QVTK)
IF(VTK_USE_VIEWS)
TARGET_LINK_LIBRARIES(vtkQtPythonD vtkViewsPythonD)
ENDIF(VTK_USE_VIEWS)
TARGET_LINK_LIBRARIES(vtkQtPythonD vtkRenderingPythonD vtkPythonCore)
PYTHON_ADD_MODULE(vtkQtPython vtkQtPythonInit.cxx) PYTHON_ADD_MODULE(vtkQtPython vtkQtPythonInit.cxx)
TARGET_LINK_LIBRARIES(vtkQtPython vtkQtPythonD) TARGET_LINK_LIBRARIES(vtkQtPython vtkQtPythonD)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment