Commit d7d21495 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Directory restructuring of Servers.

* Created new ParaViewCore directory in place of Servers.
* Moved classes from old directories to new ones.
* Removed some obsolete classes that were lingering in Filters/ServerManager.
parent 79b892c2
......@@ -751,7 +751,8 @@ IF(PARAVIEW_USE_VISITBRIDGE)
PARAVIEW_INCLUDE_GUI_RESOURCES(${VISITBRIDGE_READERS_GUI_XML_FILE})
ENDIF(PARAVIEW_USE_VISITBRIDGE)
ADD_SUBDIRECTORY(Servers)
#ADD_SUBDIRECTORY(Servers)
ADD_SUBDIRECTORY(ParaViewCore)
#########################################################################
# Configure Python executable
......
PROJECT(ParaViewCore)
ADD_SUBDIRECTORY(Common)
ADD_SUBDIRECTORY(VTKExtensions)
ADD_SUBDIRECTORY(ClientServerCore)
ADD_SUBDIRECTORY(ServerImplementation)
ADD_SUBDIRECTORY(ServerManager)
# PVClientServerCore contains classes essential for client-server mechanisms in
# ParaView.
# This also includes additional extensions to VTK that depend on ProcessModule
# or sessions.
PROJECT(PVClientServerCore)
INCLUDE_REGULAR_EXPRESSION("^vtk.*$")
# needed by vtkExportKit.cmake
SET(VTK_INSTALL_PACKAGE_DIR_CM24 ${PV_INSTALL_LIB_DIR})
SET(VTK_INSTALL_PACKAGE_DIR ${PV_INSTALL_LIB_DIR})
SET(KIT PVClientServerCore)
SET(KIT_UPCASE "PVCLIENTSERVERCORE")
IF(NOT WIN32)
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
ADD_DEFINITIONS(-D_HPUX_SOURCE)
ENDIF(NOT WIN32)
SET (Kit_SRCS
vtk3DWidgetRepresentation.cxx
vtkCaveSynchronizedRenderers.cxx
vtkChartRepresentation.cxx
vtkClientServerMoveData.cxx
vtkCompleteArrays.cxx
vtkCompositeRepresentation.cxx
vtkCubeAxesRepresentation.cxx
vtkDataLabelRepresentation.cxx
vtkGeometryRepresentation.cxx
vtkGeometryRepresentationWithFaces.cxx
vtkGlyph3DRepresentation.cxx
vtkImageSliceDataDeliveryFilter.cxx
vtkImageSliceMapper.cxx
vtkImageSliceRepresentation.cxx
vtkImageVolumeRepresentation.cxx
vtkMPIMToNSocketConnection.cxx
vtkMPIMToNSocketConnectionPortInformation.cxx
vtkMPIMoveData.cxx
vtkNetworkAccessManager.cxx
vtkNetworkImageSource.cxx
vtkOutlineRepresentation.cxx
vtkPV2DRenderView.cxx
vtkPVAlgorithmPortsInformation.cxx
vtkPVArrayInformation.cxx
vtkPVCacheKeeper.cxx
vtkPVCacheKeeperPipeline.cxx
vtkPVCacheSizeInformation.cxx
vtkPVCameraAnimationCue.cxx
vtkPVCameraCueManipulator.cxx
vtkPVCameraKeyFrame.cxx
vtkPVClassNameInformation.cxx
vtkPVClientServerSynchronizedRenderers.cxx
vtkPVCompositeDataInformation.cxx
vtkPVCompositeDataInformationIterator.cxx
vtkPVCompositeRepresentation.cxx
vtkPVContextView.cxx
vtkPVDataInformation.cxx
vtkPVDataRepresentation.cxx
vtkPVDataRepresentationPipeline.cxx
vtkPVDataSetAttributesInformation.cxx
vtkPVDataSizeInformation.cxx
vtkPVDisplayInformation.cxx
vtkPVEnvironmentInformation.cxx
vtkPVEnvironmentInformationHelper.cxx
vtkPVFileInformation.cxx
vtkPVFileInformationHelper.cxx
vtkPVGenericAttributeInformation.cxx
vtkPVImplicitPlaneRepresentation.cxx
vtkPVInformation.cxx
vtkPVLastSelectionInformation.cxx
vtkPVOpenGLExtensionsInformation.cxx
vtkPVOptions.cxx
vtkPVOptionsXMLParser.cxx
vtkPVParallelCoordinatesRepresentation.cxx
vtkPVPlugin.cxx
vtkPVPluginInformation.cxx
vtkPVPluginLoader.cxx
vtkPVPluginTracker.cxx
vtkPVPluginsInformation.cxx
vtkPVProgressHandler.cxx
vtkPVPythonModule.cxx
vtkPVPythonPluginInterface.cxx
vtkPVRenderView.cxx
vtkPVRepresentedDataInformation.cxx
vtkPVSILInformation.cxx
vtkPVSelectionInformation.cxx
vtkPVServerInformation.cxx
vtkPVServerManagerPluginInterface.cxx
vtkPVServerOptions.cxx
vtkPVSession.cxx
vtkPVSynchronizedRenderWindows.cxx
vtkPVSynchronizedRenderer.cxx
vtkPVTemporalDataInformation.cxx
vtkPVTimerInformation.cxx
vtkPVView.cxx
vtkPVXYChartView.cxx
vtkProcessModule.cxx
vtkProcessModuleAutoMPI.cxx
vtkSelectionDeliveryFilter.cxx
vtkSelectionRepresentation.cxx
vtkSession.cxx
vtkSessionIterator.cxx
vtkSpreadSheetRepresentation.cxx
vtkSpreadSheetView.cxx
vtkTCPNetworkAccessManager.cxx
vtkTextSourceRepresentation.cxx
vtkUnstructuredDataDeliveryFilter.cxx
vtkUnstructuredGridVolumeRepresentation.cxx
vtkXMLPVAnimationWriter.cxx
vtkXYChartRepresentation.cxx
)
IF (PARAVIEW_USE_ICE_T AND VTK_USE_MPI)
SET (Kit_SRCS
${Kit_SRCS}
vtkIceTSynchronizedRenderers.cxx)
INCLUDE_DIRECTORIES(${ICET_INCLUDE_DIR})
SET(KIT_LIBS ${KIT_LIBS} IceTCore IceTMPI IceTGL)
ENDIF (PARAVIEW_USE_ICE_T AND VTK_USE_MPI)
IF(PARAVIEW_ENABLE_PYTHON)
SET(Kit_SRCS ${Kit_SRCS}
vtkPythonCalculator.cxx
vtkPythonProgrammableFilter.cxx
)
SET (KIT_LIBS ${KIT_LIBS} ${PYTHON_LIBRARIES} vtkPVPythonInterpretor)
INCLUDE_DIRECTORIES(
${PYTHON_INCLUDE_PATH}
${VTKPythonWrapping_SOURCE_DIR}/Executable)
ENDIF(PARAVIEW_ENABLE_PYTHON)
SET_SOURCE_FILES_PROPERTIES(
vtkProcessModuleAutoMPI.cxx
vtkPVOptionsXMLParser.cxx
vtkPVPlugin.cxx
vtkPVServerOptions.cxx
vtkPVServerManagerPluginInterface.cxx
vtkPVPythonPluginInterface.cxx
WRAP_EXCLUDE
)
SET_SOURCE_FILES_PROPERTIES(
vtkNetworkAccessManager.cxx
vtkPVContextView.cxx
vtkPVDataRepresentation.cxx
vtkPVInformation.cxx
vtkPVPlugin.cxx
vtkPVPluginTracker.cxx
vtkPVPythonPluginInterface.cxx
vtkPVServerManagerPluginInterface.cxx
vtkPVSession.cxx
vtkPVView.cxx
vtkSession.cxx
vtkTileDisplayHelper.cxx
ABSTRACT)
INCLUDE_DIRECTORIES(
${PVCommon_SOURCE_DIR}
${PVCommon_BINARY_DIR}
${PVVTKExtensions_SOURCE_DIR}
${PVVTKExtensions_BINARY_DIR}
${PVClientServerCore_SOURCE_DIR}
${PVClientServerCore_BINARY_DIR}
${VTK_INCLUDE_DIR}
)
IF (VTK_USE_MPI)
INCLUDE_DIRECTORIES(${MPI_INCLUDE_PATH})
SET (Kit_SRCS ${Kit_SRCS} vtkPVMPICommunicator.cxx)
SET_SOURCE_FILES_PROPERTIES(
vtkPVMPICommunicator.cxx
WRAP_EXCLUDE)
IF (MPI_LIBRARY)
SET(KIT_LIBS ${KIT_LIBS} "${MPI_LIBRARY}")
ELSE (MPI_LIBRARY)
MESSAGE("Could not find the required MPI libraries")
ENDIF (MPI_LIBRARY)
IF (MPI_EXTRA_LIBRARY)
SET(KIT_LIBS ${KIT_LIBS} "${MPI_EXTRA_LIBRARY}")
ENDIF (MPI_EXTRA_LIBRARY)
ENDIF (VTK_USE_MPI)
# for vtkPVFileInformation
IF(WIN32)
SET(KIT_LIBS ${KIT_LIBS} mpr)
ENDIF(WIN32)
IF(MINGW)
SET(KIT_LIBS ${KIT_LIBS} uuid ole32)
ENDIF(MINGW)
IF(APPLE)
SET(KIT_LIBS ${KIT_LIBS} "-framework CoreServices")
ENDIF(APPLE)
SET(VTK_WRAP_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/hints)
# Setup vtkInstantiator registration for this library's classes.
INCLUDE(${ParaView_SOURCE_DIR}/VTK/CMake/vtkMakeInstantiator.cmake)
VTK_MAKE_INSTANTIATOR3(vtk${KIT}Instantiator KitInstantiator_SRCS
"${Kit_SRCS}"