diff --git a/Filters/Selection/CMakeLists.txt b/Filters/Selection/CMakeLists.txt
index 85c9f293b3e349a557f5a268b8bcea995d55dc71..0323645e2b3f3da087ab2ad89b10a87b75d21c46 100644
--- a/Filters/Selection/CMakeLists.txt
+++ b/Filters/Selection/CMakeLists.txt
@@ -1,7 +1,7 @@
-set(Module_SRCS
-  vtkKdTreeSelector.cxx
-  vtkLinearSelector.cxx
-  vtkCellDistanceSelector.cxx
-  )
+set(classes
+  vtkKdTreeSelector
+  vtkLinearSelector
+  vtkCellDistanceSelector)
 
-vtk_module_library(vtkFiltersSelection ${Module_SRCS})
+vtk_module_add_module(VTK::FiltersSelection
+  CLASSES ${classes})
diff --git a/Filters/Selection/Testing/CMakeLists.txt b/Filters/Selection/Testing/CMakeLists.txt
index 35f9732a938a3b073bdf94e86007916ffcd31b49..42f73e05256cd3fe580d78678a26f7698526d5d7 100644
--- a/Filters/Selection/Testing/CMakeLists.txt
+++ b/Filters/Selection/Testing/CMakeLists.txt
@@ -1 +1,5 @@
+vtk_module_test_data(
+  Data/AngularSector.vtk
+  Data/SemiDisk/SemiDisk.vtk)
+
 add_subdirectory(Cxx)
diff --git a/Filters/Selection/module.cmake b/Filters/Selection/module.cmake
deleted file mode 100644
index bd11338cbfeb516ca998abb3cc2a027017a9c355..0000000000000000000000000000000000000000
--- a/Filters/Selection/module.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-vtk_module(vtkFiltersSelection
-  GROUPS
-    StandAlone
-  TEST_DEPENDS
-    vtkFiltersExtraction
-    vtkIOLegacy
-    vtkIOXML
-    vtkRenderingOpenGL2
-    vtkRenderingAnnotation
-    vtkTestingRendering
-    vtkInteractionStyle
-  KIT
-    vtkFilters
-  DEPENDS
-    vtkCommonCore
-    vtkCommonExecutionModel
-  PRIVATE_DEPENDS
-    vtkCommonDataModel
-  )
diff --git a/Filters/Selection/vtk.module b/Filters/Selection/vtk.module
new file mode 100644
index 0000000000000000000000000000000000000000..a358424cf3515f64d939ff4b590cb0a2b0663751
--- /dev/null
+++ b/Filters/Selection/vtk.module
@@ -0,0 +1,21 @@
+NAME
+  VTK::FiltersSelection
+LIBRARY_NAME
+  vtkFiltersSelection
+KIT
+  VTK::Filters
+GROUPS
+  StandAlone
+DEPENDS
+  VTK::CommonCore
+  VTK::CommonExecutionModel
+PRIVATE_DEPENDS
+  VTK::CommonDataModel
+TEST_DEPENDS
+  VTK::FiltersExtraction
+  VTK::IOLegacy
+  VTK::IOXML
+  VTK::InteractionStyle
+  VTK::RenderingAnnotation
+  VTK::RenderingOpenGL2
+  VTK::TestingRendering