Renaming for clarity

Plugins/CGAL/CGAL.plugin

@@ -1,8 +1,9 @@
 NAME
-  CGALFilter
+  CGALPlugins
 DESCRIPTION
   Set of CGAL plugins
 CONDITION
 REQUIRES_MODULES
   VTK::FiltersCore
+  VTK::CommonDataModel
   VTK::CommonExecutionModel

Plugins/CGAL/CMakeLists.txt

@@ -5,17 +5,17 @@ set(BUILD_SHARED_LIBS TRUE)
 #in the UI
 if(ParaView_FOUND AND PARAVIEW_USE_FILE)
   ## ParaView 5.6
-    add_subdirectory(CGALFilters)
+    add_subdirectory(vtkCGAL)
 else()
   ## ParaView 6.x
   vtk_module_scan(
-    MODULE_FILES      "${CMAKE_CURRENT_SOURCE_DIR}/CGALFilters/vtk.module"
-    REQUEST_MODULES   CGALFilters
+    MODULE_FILES      "${CMAKE_CURRENT_SOURCE_DIR}/vtkCGAL/vtk.module"
+    REQUEST_MODULES   vtkCGAL
     PROVIDES_MODULES  provided_modules)
 
   vtk_module_build(MODULES ${provided_modules})
 
-  paraview_add_plugin(CGALFilter
+  paraview_add_plugin(CGALPlugins
     VERSION "1.0"
-    MODULES CGALFilters)
+    MODULES vtkCGAL)
 endif()

Plugins/CGAL/CGALFilters/CMakeLists.txt → Plugins/CGAL/vtkCGAL/CMakeLists.txt

@@ -8,26 +8,26 @@ endif(CGAL_FOUND)
 #in the UI
 if(ParaView_FOUND AND PARAVIEW_USE_FILE)
   ## ParaView 5.6
-  add_paraview_plugin(CGALFilter "1.0"
-    SERVER_MANAGER_XML vtkCGALFilters.xml
+  add_paraview_plugin(CGALPlugins "1.0"
+    SERVER_MANAGER_XML vtkCGALPlugins.xml
     SERVER_MANAGER_SOURCES vtkCGAL3DPolyhedralMesher.cxx
                            vtkCGALBoolean.cxx)
 
-  target_link_libraries(CGALFilter PRIVATE CGAL::CGAL)
+  target_link_libraries(CGALPlugins PRIVATE CGAL::CGAL)
 
 else()
   ## ParaView 6.0 or later
   set(classes
     vtkCGAL3DPolyhedralMesher
     vtkCGALBoolean)
 
-  vtk_module_add_module(CGALFilters
+  vtk_module_add_module(vtkCGAL
     CLASSES ${classes})
 
   paraview_add_server_manager_xmls(
-    XMLS  vtkCGALFilters.xml)
+    XMLS  vtkCGALPlugins.xml)
 
   # Link with CGAL
-  target_link_libraries(CGALFilters PRIVATE CGAL::CGAL)
+  target_link_libraries(vtkCGAL PRIVATE CGAL::CGAL)
 
 endif()

Plugins/CGAL/CGALFilters/vtk.module → Plugins/CGAL/vtkCGAL/vtk.module

@@ -1,8 +1,8 @@
 NAME
-  CGALFilters
+  vtkCGAL
 DEPENDS
   VTK::FiltersCore
   VTK::FiltersGeometry
-  VTK::CommonSystem
 PRIVATE_DEPENDS
   VTK::CommonCore
+  VTK::CommonSystem

Plugins/CGAL/CGALFilters/vtkCGAL3DPolyhedralMesher.h → Plugins/CGAL/vtkCGAL/vtkCGAL3DPolyhedralMesher.h

@@ -2,11 +2,11 @@
 #define vtkCGAL3DPolyhedralMesher_h
 
 #include "vtkPolyDataAlgorithm.h"
-#include <CGALFiltersModule.h>
+#include <vtkCGALModule.h>
 
 class vtkPointSet;
 
-class CGALFILTERS_EXPORT vtkCGAL3DPolyhedralMesher : public vtkPolyDataAlgorithm
+class VTKCGAL_EXPORT vtkCGAL3DPolyhedralMesher : public vtkPolyDataAlgorithm
 {
 public:
   static vtkCGAL3DPolyhedralMesher* New();

Plugins/CGAL/CGALFilters/vtkCGALBoolean.h → Plugins/CGAL/vtkCGAL/vtkCGALBoolean.h

@@ -4,14 +4,14 @@
 #include "vtkPolyDataAlgorithm.h" 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Surface_mesh.h>
-#include <CGALFiltersModule.h>
+#include <vtkCGALModule.h>
 
 class vtkPolyData;
 class vtkUnstructuredGrid;
 
 
 // Inherit from the desired filter
-class CGALFILTERS_EXPORT vtkCGALBoolean : public vtkPolyDataAlgorithm
+class VTKCGAL_EXPORT vtkCGALBoolean : public vtkPolyDataAlgorithm
 {
 public:
   // VTK requirements