Commit d9144338 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'remove-wrap-exclude-properties'

a8a799ce cmake: remove WRAP_EXCLUDE properties
678b583e ClientServer: depend on the hierarchy target
9c2d59de ParaViewPlugins: create the hierarchy when CS wrapping
a946c50f wrapping: enable the hierarchy unconditionally
5146b80d ClientServer: get the expected function from the filename
374a2e47

 CDIReader: move cdilib.c to SERVER_SOURCES
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !2058
parents 999c3926 a8a799ce
Pipeline #84468 failed with stage
in 0 seconds
......@@ -137,7 +137,6 @@ set_source_files_properties(
# No need to wrap vtkPExtentTranslator, its an internal class.
vtkPExtentTranslator
PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1
)
......
......@@ -46,8 +46,4 @@ set(Module_SRCS
vtkPVInstantiator.h
)
set_source_files_properties(
vtkClientServerInterpreterInitializer
WRAP_EXCLUDE)
vtk_module_library(vtkPVCommon ${Module_SRCS})
......@@ -67,7 +67,6 @@ set (Module_SRCS
set_source_files_properties(
vtkSMMessage
PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1)
# Add header-only files so they get installed correctly.
......
......@@ -136,10 +136,4 @@ set (Module_SRCS
vtkSMWriterProxy.cxx
)
SET_SOURCE_FILES_PROPERTIES(
vtkSMPropertyHelper
vtkSMRangeDomainTemplate
vtkSMUncheckedPropertyHelper
WRAP_EXCLUDE)
vtk_module_library(vtkPVServerManagerCore ${Module_SRCS})
......@@ -87,8 +87,6 @@ list(APPEND Module_SRCS
vtkSMParaViewPipelineControllerWithRendering.cxx
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx)
set_source_files_properties(${vtk-module}ObjectFactory WRAP_EXCLUDE)
# Override some rendering classes. Create object factory:
set(vtk_module_overrides "vtkSMParaViewPipelineController")
set(vtk_module_vtkSMParaViewPipelineController_override
......@@ -131,7 +129,6 @@ set(${vtk-module}_HDRS
${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h)
set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
HEADER_FILE_ONLY
WRAP_EXCLUDE)
HEADER_FILE_ONLY)
#-----------------------------------------------------------------------------
vtk_module_library(vtkPVServerManagerRendering ${Module_SRCS})
......@@ -25,7 +25,6 @@ set_source_files_properties(
vtkCGNSReaderInternal
vtkFileSeriesHelper
PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1
SKIP_HEADER_INSTALL 1
)
......
......@@ -59,12 +59,4 @@ set(Module_SRCS
vtkUndoStack.cxx
)
set_source_files_properties(
vtkCommunicationErrorCatcher
vtkMultiProcessControllerHelper
vtkPVInformationKeys
vtkMemberFunctionCommand
WRAP_EXCLUDE
)
vtk_module_library(vtkPVVTKExtensionsCore ${Module_SRCS})
......@@ -41,10 +41,6 @@ set(Module_SRCS
vtk_module_export_code_find_package(GenericIO)
set_source_files_properties(
vtkGenericIOUtilities.cxx
WRAP_EXCLUDE
)
set_source_files_properties(
vtkGenericIOUtilities
PROPERTIES WRAP_EXCLUDE_PYTHON 1)
......
......@@ -147,26 +147,6 @@ set (${vtk-module}_HDRS
vtkMaterialInterfaceIdListItem.h
)
set_source_files_properties(
vtkAMRDualGridHelper
vtkGridAxesHelper
vtkMaterialInterfaceCommBuffer
vtkMaterialInterfaceIdList
vtkMaterialInterfacePieceLoading
vtkMaterialInterfacePieceTransaction
vtkMaterialInterfacePieceTransactionMatrix
vtkMaterialInterfaceProcessLoading
vtkMaterialInterfaceProcessRing
vtkMaterialInterfaceToProcMap
vtkPVPlotTime
vtkSpyPlotBlock
vtkSpyPlotBlockIterator
vtkSpyPlotIStream
vtkSpyPlotReaderMap
vtkSpyPlotUniReader
WRAP_EXCLUDE
)
set_source_files_properties(
vtkSpyPlotBlockIterator
PROPERTIES WRAP_EXCLUDE_PYTHON 1
......
......@@ -35,7 +35,6 @@ endif()
set_source_files_properties(
${Module_SRCS}
PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1
SKIP_HEADER_INSTALL 1)
......
......@@ -134,7 +134,7 @@ foreach (file vtkIceTCompositeZPassShader_fs.glsl)
HEADER_OUTPUT header
SOURCE_OUTPUT source)
list(APPEND Module_SRCS ${source})
set_source_files_properties(${header} ${source} PROPERTIES WRAP_EXCLUDE 1 WRAP_EXCLUDE_PYTHON 1)
set_source_files_properties(${header} ${source} PROPERTIES WRAP_EXCLUDE_PYTHON 1)
endforeach()
#---------------------------------------------------------
......
......@@ -13,6 +13,7 @@ add_paraview_plugin(CDIReader "1.0"
SERVER_MANAGER_XML CDIReader.xml
SERVER_MANAGER_SOURCES
vtkCDIReader.cxx
SERVER_SOURCES
cdilib.c
REQUIRED_ON_SERVER
)
......
......@@ -1107,14 +1107,14 @@ int extractOtherClassesUsed(NewClassInfo* data, const char* classes[])
* @param fp file to write into
* @param data data which will be used to write into file
*/
void output_DummyInitFunction(FILE* fp, ClassInfo* data)
void output_DummyInitFunction(FILE* fp, const char* name)
{
fprintf(fp, "#include \"vtkSystemIncludes.h\"\n"
"#include \"vtkClientServerInterpreter.h\"\n"
"void VTK_EXPORT %s_Init(vtkClientServerInterpreter* /*csi*/)\n"
"{\n"
"}\n",
data->Name);
name);
}
//--------------------------------------------------------------------------nix
......@@ -1265,13 +1265,18 @@ int main(int argc, char* argv[])
if (!data)
{
char* basename = strrchr(fileInfo->FileName, '/');
char* basename_dup = strdup(basename);
*strchr(basename_dup, '.') = '\0';
output_DummyInitFunction(fp, basename_dup + 1);
free(basename_dup);
fclose(fp);
exit(1);
exit(0);
}
if (data->Template)
{
output_DummyInitFunction(fp, data);
output_DummyInitFunction(fp, data->Name);
fclose(fp);
exit(0);
}
......@@ -1280,7 +1285,7 @@ int main(int argc, char* argv[])
{
if (strchr(data->SuperClasses[i], '<'))
{
output_DummyInitFunction(fp, data);
output_DummyInitFunction(fp, data->Name);
fclose(fp);
exit(0);
}
......@@ -1304,7 +1309,7 @@ int main(int argc, char* argv[])
{
if (!vtkWrap_IsTypeOf(hierarchyInfo, data->Name, "vtkObjectBase"))
{
output_DummyInitFunction(fp, data);
output_DummyInitFunction(fp, data->Name);
fclose(fp);
exit(0);
}
......
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