Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some deprecated hacks in modules

Browse Source 
When the configure modules were first created, there were some hacks
around filters that had not yet moved to the new filter mechanism. These
can (and should) be removed.
This commit is contained in:
Kenneth Moreland 2022-10-27 10:24:28 -06:00
parent f8e5342e14
commit 96b447e69a
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMake/VTKmWrappers.cmake
View File

@ -517,12 +517,9 @@ function(vtkm_library)
if(NOT lib_name STREQUAL vtkm_module_current) if(NOT lib_name STREQUAL vtkm_module_current)
# We do want each library to be in its own module. (VTK's module allows you to declare # We do want each library to be in its own module. (VTK's module allows you to declare
# multiple libraries per module. We may want that in the future, but right now we should # multiple libraries per module. We may want that in the future, but right now we should
# not need it.) Right now we have one exception: vtkm_filter_extra inside of the # not need it.)
# vtkm_filter_core module. We are in the process of moving the filters to the new filter message(FATAL_ERROR
# structure, and when that is done, vtkm_filter_extra should go away. But it is complex "Library name `${lib_name}` does not match module name `${vtkm_module_current}`")
# and will take some time. When that is done, perhaps this should be a stronger message
# (either a warning or error).
message("Library name `${lib_name}` does not match module name `${vtkm_module_current}`")
endif() endif()
vtkm_module_get_property(depends ${vtkm_module_current} DEPENDS) vtkm_module_get_property(depends ${vtkm_module_current} DEPENDS)
vtkm_module_get_property(private_depends ${vtkm_module_current} PRIVATE_DEPENDS) vtkm_module_get_property(private_depends ${vtkm_module_current} PRIVATE_DEPENDS)

1
benchmarking/vtkm.module
View File

@ -16,5 +16,4 @@ DEPENDS
vtkm_source vtkm_source
OPTIONAL_DEPENDS OPTIONAL_DEPENDS
vtkm_rendering vtkm_rendering
vtkm_filter_extra # Hack for non-module library that should go away.
NO_TESTING NO_TESTING

3
vtkm/filter/vtkm.module
View File

@ -9,9 +9,6 @@ TEST_DEPENDS
vtkm_filter vtkm_filter
vtkm_io vtkm_io
vtkm_source vtkm_source
# The following depend is only for UnitTestContourTreeUniformDistributedFilter.
# This dependency should be removed when that test is moved to its own library.
vtkm_filter_scalar_toplogy
TEST_OPTIONAL_DEPENDS TEST_OPTIONAL_DEPENDS
vtkm_rendering vtkm_rendering
vtkm_rendering_testing vtkm_rendering_testing