Commit 57615f07 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Adding IF (FIXME) to skip most of servermanager as we bring in components.

parent e9307a50
......@@ -207,9 +207,10 @@ FUNCTION (protobuf_generate out_cpp_file in_proto_file)
GET_FILENAME_COMPONENT(basename ${in_proto_file} NAME_WE)
GET_FILENAME_COMPONENT(absolute ${in_proto_file} ABSOLUTE)
GET_FILENAME_COMPONENT(path ${absolute} PATH)
SET(${outfile} ${CMAKE_CURRENT_BINARY_DIR}/${basename}.pb.cc)
SET (out_file ${CMAKE_CURRENT_BINARY_DIR}/${basename}.pb.cc)
SET(${out_cpp_file} ${out_file} PARENT_SCOPE)
ADD_CUSTOM_COMMAND(
OUTPUT ${${outfile}}
OUTPUT ${out_file}
COMMAND protoc_compiler --cpp_out=${CMAKE_CURRENT_BINARY_DIR} --proto_path ${path} ${absolute}
DEPENDS ${in_proto_file} protoc_compiler
)
......
......@@ -315,8 +315,9 @@ SET(PARAVIEW_SMTESTDRIVER_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/smTestDriver${PV
# release/debug configuration gets considered.
GET_TARGET_PROPERTY(PARAVIEW_PROCESS_XML_EXECUTABLE kwProcessXML LOCATION)
IF (FIXME)
ADD_SUBDIRECTORY(Plugins)
ENDIF (FIXME)
#########################################################################
IF (PARAVIEW_BUILD_QT_GUI)
......
PROJECT(PVServers)
IF (FIXME)
INCLUDE_DIRECTORIES(
${ParaView_BINARY_DIR}
${PVSERVERCOMMON_INCLUDE_DIR}
......@@ -104,4 +106,4 @@ build_paraview_client_cpack_config_init(
SET (CPACK_INSTALL_CMAKE_PROJECTS_DRAGNDROP
${CPACK_INSTALL_CMAKE_PROJECTS})
build_paraview_client_cpack_config()
ENDIF (FIXME)
......@@ -17,7 +17,8 @@ IF(NOT WIN32)
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
ADD_DEFINITIONS(-D_HPUX_SOURCE)
ENDIF(NOT WIN32)
SET (Kit_SRCS)
IF (FIXME)
SET(Kit_SRCS
vtkDummyProcessModuleHelper.cxx
vtkInitializationHelper.cxx
......@@ -235,7 +236,7 @@ SET( ServerManagerNonWrapped_SRCS
vtkPVBatchOptions.cxx
vtkSMXMLParser.cxx
)
ENDIF (FIXME)
SET( ServerManager_SRCS
${ServerManagerCS_SRCS}
${Kit_SRCS}
......@@ -244,6 +245,7 @@ SET( ServerManager_SRCS
)
# Abstract and Wrap exclude
IF (FIXME)
SET_SOURCE_FILES_PROPERTIES(
vtkInitializationHelper.cxx
vtkSMAnimationCueManipulatorProxy.cxx
......@@ -272,7 +274,7 @@ SET_SOURCE_FILES_PROPERTIES(
vtkSMRenderViewHelper.cxx
vtkSMPropertyHelper.cxx
WRAP_EXCLUDE)
ENDIF (FIXME)
INCLUDE_DIRECTORIES(
${VTK_INCLUDE_DIR}
......@@ -285,9 +287,17 @@ INCLUDE_DIRECTORIES(
${ParaView_BINARY_DIR}/Servers/Common
${ParaView_BINARY_DIR}/Servers/Filters
${KWCommon_INCLUDE_PATH}
${protobuf_SOURCE_DIR}/src
)
#------------------------------------------------------------------------------
# Compile protobuf resources.
set (protobuf_generated_files)
protobuf_generate(
protobuf_generated_files
${CMAKE_CURRENT_SOURCE_DIR}/Resources/vtkPVMessage.proto)
#------------------------------------------------------------------------------
SET(VTK_WRAP_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/hints)
# Setup vtkInstantiator registration for this library's classes.
......@@ -328,8 +338,10 @@ ADD_LIBRARY(vtk${KIT}
${CMInstantiator_SRCS}
${vtkPVServerManagerCS_SRCS}
${KitInstantiator_SRCS}
${protobuf_generated_files}
)
TARGET_LINK_LIBRARIES(vtk${KIT}
protobuf
vtkPVFiltersCS
vtkClientServer
${KWCommon_LIBRARIES}
......@@ -423,6 +435,8 @@ SET(GUI_CONFIG_FILES
ParaViewWriters
)
IF (FIXME)
IF(NOT CMAKE_CROSSCOMPILING)
add_executable_with_forwarding(PV_EXE_SUFFIX
vtkSMExtractDocumentation vtkSMExtractDocumentation.cxx)
......@@ -459,6 +473,8 @@ ADD_CUSTOM_TARGET(HTMLDocumentation
SET (HTMLDocumentation_FILES ${HTML_RESULTS} CACHE INTERNAL
"HTMLDocumentation files generated from ServerManager")
ENDIF (FIXME)
SET(PARAVIEW_INCLUDE_MODULES_TO_SMAPPLICATION "")
FOREACH(rf ${resourceFiles})
STRING(REGEX REPLACE "^.*/(.*).(xml|pvsm)$" "\\1" moduleName "${rf}")
......
// ****************************************************************************
// vtkInternalDataStreamIO.proto
// ****************************************************************************
package paraview_protobuf;
// Type of generated code : [SPEED, CODE_SIZE, LITE_RUNTIME]
//option optimize_for = LITE_RUNTIME;
// Variant type ***************************************************************
message Variant {
enum Type
{
INT = 0;
FLOAT64 = 1;
IDTYPE = 2;
STRING = 3;
PROXY = 4; // proxy_global_id + port_number
INPUT = 5; // proxy_global_id + port_number
}
required Type type = 1;
repeated sint64 idtype = 3;
repeated sint32 integer = 4;
repeated double float64 = 5;
repeated int64 proxy_global_id = 6;
repeated int32 port_number = 7;
repeated string txt = 8;
}
// Generic message Collection type ********************************************
message MessageCollection
{
// This defines an item in the collection.
repeated Message item = 1;
}
// Generic message type ******************************************* [1-2 :> 10]
message Message
{
required uint64 global_id = 1;
required uint32 location = 2;
extensions 10 to max;
}
// Extension DefinitionHeader ***************************************** [10-11]
message DefinitionHeader
{
extend Message {
// The classname for the driver process i.e. the client, typically
required string client_class = 10;
// The classname for the process where the processing occurs
required string server_class = 11;
}
}
// Extension ProxyState *********************************************** [20-22]
message ProxyState
{
message Property
{
required string name = 1;
repeated Variant value = 2;
}
extend Message {
required string xml_group = 20;
required string xml_name = 21;
repeated Property property = 22;
}
}
// Extension ProxyManagerState ******************************************* [30]
message ProxyManagerState
{
message ProxyRegistrationInfo
{
required string group = 1;
required string name = 2;
required uint64 global_id = 3;
}
extend Message {
repeated ProxyRegistrationInfo registered_proxy = 30;
}
}
// Extension PullRequest ************************************************* [40]
message PullRequest {
extend Message {
repeated Variant arguments = 40;
}
}
// Extension InvokeRequest ******************************************** [50-51]
message InvokeRequest {
extend Message {
required string method = 50;
repeated Variant arguments = 51;
}
}
// Extension InvokeResponse ********************************************** [60]
message InvokeResponse {
extend Message {
optional Variant arguments = 60;
}
}
// End of Messages definitions ************************************************
IF (FIXME)
################################################################################
SET(ServersServerManager_SRCS
ServersServerManagerPrintSelf
......@@ -53,3 +54,4 @@ IF (PVServerManagerTestData)
${SMSTATE_FILE_DIR}/${tfile}.pvsm)
ENDFOREACH(tfile)
ENDIF (PVServerManagerTestData)
ENDIF (FIXME)
Markdown is supported
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