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
include(ParaViewMacros) include(ParaViewMacros)
include(vtkWrapHierarchy)
if(DEFINED PV_INSTALL_PLUGIN_DIR) if(DEFINED PV_INSTALL_PLUGIN_DIR)
message(WARNING "`PV_INSTALL_PLUGIN_DIR` is no longer supported as of ParaView 5.5. " message(WARNING "`PV_INSTALL_PLUGIN_DIR` is no longer supported as of ParaView 5.5. "
...@@ -122,6 +123,9 @@ MACRO(ADD_SERVER_MANAGER_EXTENSION OUTSRCS Name Version XMLFile) ...@@ -122,6 +123,9 @@ MACRO(ADD_SERVER_MANAGER_EXTENSION OUTSRCS Name Version XMLFile)
IF(HDRS) IF(HDRS)
include(vtkWrapClientServer) include(vtkWrapClientServer)
vtk_wrap_hierarchy(${Name} ${VTK_MODULES_DIR}
"${ARGN}")
# Plugins should not use unified bindings. The problem arises because the # Plugins should not use unified bindings. The problem arises because the
# PythonD library links to the plugin itself, but the CS wrapping code # PythonD library links to the plugin itself, but the CS wrapping code
# lives in the plugin as well. With unified bindings, the CS wrapping # lives in the plugin as well. With unified bindings, the CS wrapping
...@@ -983,9 +987,10 @@ MACRO(WRAP_PLUGIN_FOR_PYTHON NAME WRAP_LIST WRAP_EXCLUDE_LIST) ...@@ -983,9 +987,10 @@ MACRO(WRAP_PLUGIN_FOR_PYTHON NAME WRAP_LIST WRAP_EXCLUDE_LIST)
#VTK/Common/KitCommonPythonWrapBlock so that plugin's name #VTK/Common/KitCommonPythonWrapBlock so that plugin's name
#does not to start with "vtk". #does not to start with "vtk".
SET_SOURCE_FILES_PROPERTIES( if ("${WRAP_EXCLUDE_LIST}")
${WRAP_EXCLUDE_LIST} message(WARNING
WRAP_EXCLUDE) "The WRAP_EXCLUDE property is not used anymore.")
endif ()
SET(Kit_PYTHON_EXTRA_SRCS) SET(Kit_PYTHON_EXTRA_SRCS)
...@@ -1133,6 +1138,8 @@ macro(pv_process_modules) ...@@ -1133,6 +1138,8 @@ macro(pv_process_modules)
if (NOT ${_module}_EXCLUDE_FROM_WRAPPING AND if (NOT ${_module}_EXCLUDE_FROM_WRAPPING AND
NOT ${_module}_IS_TEST AND NOT ${_module}_IS_TEST AND
NOT ${_module}_THIRD_PARTY) NOT ${_module}_THIRD_PARTY)
vtk_wrap_hierarchy(${module_name} ${VTK_MODULES_DIR}
"${ARG_SOURCES}")
set(NO_PYTHON_BINDINGS_AVAILABLE TRUE) set(NO_PYTHON_BINDINGS_AVAILABLE TRUE)
vtk_add_cs_wrapping(${_module}) vtk_add_cs_wrapping(${_module})
list(APPEND plugin_cs_modules ${_module}) list(APPEND plugin_cs_modules ${_module})
......
...@@ -94,6 +94,7 @@ macro(VTK_WRAP_ClientServer TARGET SRC_LIST_NAME SOURCES) ...@@ -94,6 +94,7 @@ macro(VTK_WRAP_ClientServer TARGET SRC_LIST_NAME SOURCES)
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TMP_FILENAME}ClientServer.cxx OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TMP_FILENAME}ClientServer.cxx
MAIN_DEPENDENCY ${TMP_INPUT} MAIN_DEPENDENCY ${TMP_INPUT}
DEPENDS ${VTK_WRAP_ClientServer_EXE} ${VTK_WRAP_HINTS} ${_target_includes_file} ${_args_file} DEPENDS ${VTK_WRAP_ClientServer_EXE} ${VTK_WRAP_HINTS} ${_target_includes_file} ${_args_file}
${BARE_TARGET}Hierarchy
COMMAND ${VTK_WRAP_ClientServer_EXE} COMMAND ${VTK_WRAP_ClientServer_EXE}
ARGS ARGS
${TMP_HINTS} ${TMP_HINTS}
......
...@@ -606,6 +606,11 @@ else() ...@@ -606,6 +606,11 @@ else()
endif() endif()
# ClientServer bindings require the hierarchy to be generated regardless of
# the enable language support.
set(VTK_WRAP_HIERARCHY ON
CACHE INTERNAL "Forcing the wrap hierarchy to be on.")
#---------------------------------------------------------------------------------- #----------------------------------------------------------------------------------
# Import all essential CMake files. Based on whether we are using internal or # Import all essential CMake files. Based on whether we are using internal or
# external VTK, these modules will be imported for the appropropriate locations. # external VTK, these modules will be imported for the appropropriate locations.
......
set_source_files_properties(
vtkCommunicationErrorCatcher
vtkMultiProcessControllerHelper
vtkPVInformationKeys
vtkMemberFunctionCommand
WRAP_EXCLUDE
)
...@@ -240,8 +240,7 @@ ...@@ -240,8 +240,7 @@
], ],
"replace": [ "replace": [
{ "path":"ParaViewCore/VTKExtensions/Core/module.cmake" }, { "path":"ParaViewCore/VTKExtensions/Core/module.cmake" },
{ "path":"ParaViewCore/VTKExtensions/Core/CMakeLists.txt" }, { "path":"ParaViewCore/VTKExtensions/Core/CMakeLists.txt" }
{ "path":"ParaViewCore/VTKExtensions/Core/Base-wrap-exclude-classes.catalyst.cmake" }
], ],
"exclude": [ "exclude": [
{ "path": "Testing" } { "path": "Testing" }
......
set_source_files_properties(
vtkContourHelper
WRAP_EXCLUDE
)
...@@ -31,8 +31,7 @@ ...@@ -31,8 +31,7 @@
{ "class":"vtkPVPlane" } { "class":"vtkPVPlane" }
], ],
"replace":[ "replace":[
{ "path":"ParaViewCore/VTKExtensions/Default/CMakeLists.txt" }, { "path":"ParaViewCore/VTKExtensions/Default/CMakeLists.txt" }
{ "path":"ParaViewCore/VTKExtensions/Default/Essentials.props.catalyst.cmake" },
{ "path":"ParaViewCore/VTKExtensions/Default/module.cmake" } { "path":"ParaViewCore/VTKExtensions/Default/module.cmake" }
], ],
"cswrap":true, "cswrap":true,
...@@ -55,9 +54,6 @@ ...@@ -55,9 +54,6 @@
{ "class":"vtkSynchronizedTemplates3D" }, { "class":"vtkSynchronizedTemplates3D" },
{ "class":"vtkSynchronizedTemplatesCutter3D" } { "class":"vtkSynchronizedTemplatesCutter3D" }
], ],
"replace":[
{ "path":"VTK/Filters/Core/Essentials.props.catalyst.cmake" }
],
"cswrap":true, "cswrap":true,
"pythonwrap":true "pythonwrap":true
}, },
......
...@@ -11,8 +11,6 @@ endforeach () ...@@ -11,8 +11,6 @@ endforeach ()
list(APPEND Module_SRCS list(APPEND Module_SRCS
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.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: # Override some rendering classes. Create object factory:
set(vtk_module_overrides "vtkSMParaViewPipelineController") set(vtk_module_overrides "vtkSMParaViewPipelineController")
set(vtk_module_vtkSMParaViewPipelineController_override set(vtk_module_vtkSMParaViewPipelineController_override
...@@ -55,8 +53,7 @@ set(${vtk-module}_HDRS ...@@ -55,8 +53,7 @@ set(${vtk-module}_HDRS
${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h) ${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h)
set_source_files_properties( set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h ${CMAKE_CURRENT_BINARY_DIR}/vtkSMTransferFunctionPresetsBuiltin.h
HEADER_FILE_ONLY HEADER_FILE_ONLY)
WRAP_EXCLUDE)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
vtk_module_library(vtkPVServerManagerRendering ${Module_SRCS}) vtk_module_library(vtkPVServerManagerRendering ${Module_SRCS})
...@@ -9,5 +9,5 @@ foreach (file vtkIceTCompositeZPassShader_fs.glsl) ...@@ -9,5 +9,5 @@ foreach (file vtkIceTCompositeZPassShader_fs.glsl)
HEADER_OUTPUT header HEADER_OUTPUT header
SOURCE_OUTPUT source) SOURCE_OUTPUT source)
list(APPEND Module_SRCS ${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() endforeach()
...@@ -6,8 +6,4 @@ foreach (cmake_file IN LISTS cmake_files) ...@@ -6,8 +6,4 @@ foreach (cmake_file IN LISTS cmake_files)
include("${cmake_file}") include("${cmake_file}")
endforeach () endforeach ()
set_source_files_properties(
vtkContextPolygon.cxx
WRAP_EXCLUDE)
vtk_module_library(vtkChartsCore ${Module_SRCS}) vtk_module_library(vtkChartsCore ${Module_SRCS})
...@@ -31,10 +31,6 @@ configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.h.in ...@@ -31,10 +31,6 @@ configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.h.in
configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.cxx.in configure_file(${VTK_CMAKE_DIR}/vtkObjectFactory.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx) ${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx)
set_source_files_properties(
${vtk-module}ObjectFactory.cxx
WRAP_EXCLUDE
)
list(APPEND Module_SRCS list(APPEND Module_SRCS
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx ${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx
) )
......
...@@ -6,9 +6,4 @@ foreach (cmake_file IN LISTS cmake_files) ...@@ -6,9 +6,4 @@ foreach (cmake_file IN LISTS cmake_files)
include("${cmake_file}") include("${cmake_file}")
endforeach () endforeach ()
set_source_files_properties(
vtkContextKeyEvent.cxx
vtkContextMouseEvent.cxx
WRAP_EXCLUDE)
vtk_module_library(vtkRenderingContext2D ${Module_SRCS}) vtk_module_library(vtkRenderingContext2D ${Module_SRCS})
...@@ -6,9 +6,4 @@ foreach (cmake_file IN LISTS cmake_files) ...@@ -6,9 +6,4 @@ foreach (cmake_file IN LISTS cmake_files)
include("${cmake_file}") include("${cmake_file}")
endforeach () endforeach ()
set_source_files_properties(
vtkCIEDE2000
vtkRenderState
WRAP_EXCLUDE)
vtk_module_library(vtkRenderingCore ${Module_SRCS}) vtk_module_library(vtkRenderingCore ${Module_SRCS})
...@@ -35,9 +35,4 @@ list(APPEND Module_SRCS ...@@ -35,9 +35,4 @@ list(APPEND Module_SRCS
${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx ${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx
) )
set_source_files_properties(
vtkFreeTypeTools.cxx
WRAP_EXCLUDE
)
vtk_module_library(vtkRenderingFreeType ${Module_SRCS}) vtk_module_library(vtkRenderingFreeType ${Module_SRCS})
...@@ -16,7 +16,3 @@ set(font_files ...@@ -16,7 +16,3 @@ set(font_files
list(APPEND Module_SRCS list(APPEND Module_SRCS
${font_files} ${font_files}
) )
set_source_files_properties(
${font_files}
WRAP_EXCLUDE
)
...@@ -22,7 +22,6 @@ foreach(file ${shader_files}) ...@@ -22,7 +22,6 @@ foreach(file ${shader_files})
${source} ${source}
${header} ${header}
PROPERTIES PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1 WRAP_EXCLUDE_PYTHON 1
) )
endforeach() endforeach()
......
...@@ -38,11 +38,6 @@ set (Module_SRCS ...@@ -38,11 +38,6 @@ set (Module_SRCS
vtkCPProcessor.cxx vtkCPProcessor.cxx
) )
set_source_files_properties(
CAdaptorAPI
vtkCPCxxHelper
WRAP_EXCLUDE)
set (${vtk-module}_HDRS CAdaptorAPI.h) set (${vtk-module}_HDRS CAdaptorAPI.h)
configure_file(vtkCPConfig.h.in configure_file(vtkCPConfig.h.in
...@@ -71,10 +66,6 @@ if (CMAKE_Fortran_COMPILER_WORKS) ...@@ -71,10 +66,6 @@ if (CMAKE_Fortran_COMPILER_WORKS)
FortranAdaptorAPI.h FortranAdaptorAPI.h
${CMAKE_CURRENT_BINARY_DIR}/FortranAdaptorAPIMangling.h) ${CMAKE_CURRENT_BINARY_DIR}/FortranAdaptorAPIMangling.h)
set_source_files_properties(
FortranAdaptorAPI
WRAP_EXCLUDE)
set_source_files_properties( set_source_files_properties(
FortranAdaptorAPI FortranAdaptorAPI
PROPERTIES PROPERTIES
......
...@@ -112,18 +112,6 @@ if (PARAVIEW_ENABLE_PYTHON) ...@@ -112,18 +112,6 @@ if (PARAVIEW_ENABLE_PYTHON)
) )
endif() endif()
set_source_files_properties(
vtkExtractsDeliveryHelper
vtkProcessModuleAutoMPI
vtkPVOptionsXMLParser
vtkPVPlugin
vtkPVPythonPluginInterface
vtkPVServerManagerPluginInterface
vtkPVServerOptions
WRAP_EXCLUDE
)
if(VTK_OPENGL_HAS_EGL) if(VTK_OPENGL_HAS_EGL)
set_source_files_properties( set_source_files_properties(
vtkPVOptions.cxx vtkPVOptions.cxx
......
...@@ -50,7 +50,6 @@ if (APPLE) ...@@ -50,7 +50,6 @@ if (APPLE)
set_source_files_properties( set_source_files_properties(
vtkPVMacFileInformationHelper vtkPVMacFileInformationHelper
PROPERTIES PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1 WRAP_EXCLUDE_PYTHON 1
SKIP_HEADER_INSTALL 1 SKIP_HEADER_INSTALL 1
) )
......
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