From 9cbc45a3b65ebe31b153ee544a90ab93b5f438c7 Mon Sep 17 00:00:00 2001 From: vtn Date: Mon, 4 Mar 2013 12:06:40 +0000 Subject: [PATCH] Porting to Paraview 3.98.1 --- idl/CMakeLists.txt | 4 +++- src/PVGUI/CMakeLists.txt | 6 ++++-- src/PVGUI/PVGUI_Module.cxx | 1 - 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index f79543bf..27b0ff63 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -88,7 +88,9 @@ FOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${PARAVIEW_INCLUDES} ${VTK_INCL SET(flags "${flags} ${f}") ENDFOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${PARAVIEW_INCLUDES} ${VTK_INCLUDES}) -#VTN TODO: +#VTN TODO: vtkParseData supports two types of structures for wrapping. +#We use old structures currently, but is is not influent for results of wrapping. +#It may be necessary to port vtkWrapIDL to new approach in future. #IF(VTK_LEGACY_REMOVE) # ADD_DEFINITIONS(-DVTK_PARSE_LEGACY_REMOVE) #ENDIF() diff --git a/src/PVGUI/CMakeLists.txt b/src/PVGUI/CMakeLists.txt index 4096204a..941a8635 100644 --- a/src/PVGUI/CMakeLists.txt +++ b/src/PVGUI/CMakeLists.txt @@ -44,7 +44,9 @@ SET(vtkWrapIDL_HH_CPPFLAGS SET(vtkWrapIDL_CC_CPPFLAGS -DIDL_I_CC ) -#VTN TODO: +#VTN TODO: vtkParseData supports two types of structures for wrapping. +#We use old structures currently, but is is not influent for results of wrapping. +#It may be necessary to port vtkWrapIDL to new approach in future. #IF(VTK_LEGACY_REMOVE) # ADD_DEFINITIONS(-DVTK_PARSE_LEGACY_REMOVE) #ENDIF() @@ -89,7 +91,7 @@ SET(dist_libPARAVIS_la_SOURCES # Check ParaView documentation file existence # if it exists add it to the resources (compile into binary form) # otherwise print warning message -SET(PV_DOC_FILE ${ParaView_INSTALL_PREFIX}/share/doc/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}/paraview.qch) +SET(PV_DOC_FILE ${VTK_INSTALL_PREFIX}/share/doc/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}/paraview.qch) IF (EXISTS ${PV_DOC_FILE}) SET(RC_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/PVGUI.qrc.in) SET(RC_GENERATED ${CMAKE_CURRENT_BINARY_DIR}/PVGUI.qrc) diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx index 2d77ea12..548982eb 100644 --- a/src/PVGUI/PVGUI_Module.cxx +++ b/src/PVGUI/PVGUI_Module.cxx @@ -426,7 +426,6 @@ void PVGUI_Module::initialize( CAM_Application* app ) // * adds support for standard paraview views. pgm->addInterface(new pqStandardViewModules(pgm)); - //VTN TODO Paraview 3.98.0: Unresolved symbol _ZN36pqStandardSummaryPanelImplementationC1EP7QObject pgm->addInterface(new pqStandardSummaryPanelImplementation(pgm)); pgm->addInterface(new pqStandardPropertyWidgetInterface(pgm)); -- 2.39.2