From 14714c3c8ec56a0c4f5adb4d35425ebdff6161e4 Mon Sep 17 00:00:00 2001 From: Patrick Laurin Date: Wed, 27 Nov 2019 15:16:08 -0500 Subject: [PATCH] Renaming for clarity --- Plugins/CGAL/CGAL.plugin | 3 ++- Plugins/CGAL/CMakeLists.txt | 10 +++++----- Plugins/CGAL/{CGALFilters => vtkCGAL}/CMakeLists.txt | 12 ++++++------ Plugins/CGAL/{CGALFilters => vtkCGAL}/vtk.module | 4 ++-- .../vtkCGAL3DPolyhedralMesher.cxx | 0 .../vtkCGAL3DPolyhedralMesher.h | 4 ++-- .../CGAL/{CGALFilters => vtkCGAL}/vtkCGALBoolean.cxx | 0 .../CGAL/{CGALFilters => vtkCGAL}/vtkCGALBoolean.h | 4 ++-- .../vtkCGALPlugins.xml} | 0 9 files changed, 19 insertions(+), 18 deletions(-) rename Plugins/CGAL/{CGALFilters => vtkCGAL}/CMakeLists.txt (69%) rename Plugins/CGAL/{CGALFilters => vtkCGAL}/vtk.module (88%) rename Plugins/CGAL/{CGALFilters => vtkCGAL}/vtkCGAL3DPolyhedralMesher.cxx (100%) rename Plugins/CGAL/{CGALFilters => vtkCGAL}/vtkCGAL3DPolyhedralMesher.h (97%) rename Plugins/CGAL/{CGALFilters => vtkCGAL}/vtkCGALBoolean.cxx (100%) rename Plugins/CGAL/{CGALFilters => vtkCGAL}/vtkCGALBoolean.h (94%) rename Plugins/CGAL/{CGALFilters/vtkCGALFilters.xml => vtkCGAL/vtkCGALPlugins.xml} (100%) diff --git a/Plugins/CGAL/CGAL.plugin b/Plugins/CGAL/CGAL.plugin index 20cb3d11d5..61b3d5dcb5 100644 --- a/Plugins/CGAL/CGAL.plugin +++ b/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 diff --git a/Plugins/CGAL/CMakeLists.txt b/Plugins/CGAL/CMakeLists.txt index 5b1f27a622..249b7b215d 100644 --- a/Plugins/CGAL/CMakeLists.txt +++ b/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() diff --git a/Plugins/CGAL/CGALFilters/CMakeLists.txt b/Plugins/CGAL/vtkCGAL/CMakeLists.txt similarity index 69% rename from Plugins/CGAL/CGALFilters/CMakeLists.txt rename to Plugins/CGAL/vtkCGAL/CMakeLists.txt index 9ca9f92889..c713b6ac8f 100644 --- a/Plugins/CGAL/CGALFilters/CMakeLists.txt +++ b/Plugins/CGAL/vtkCGAL/CMakeLists.txt @@ -8,12 +8,12 @@ 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 @@ -21,13 +21,13 @@ else() 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() \ No newline at end of file diff --git a/Plugins/CGAL/CGALFilters/vtk.module b/Plugins/CGAL/vtkCGAL/vtk.module similarity index 88% rename from Plugins/CGAL/CGALFilters/vtk.module rename to Plugins/CGAL/vtkCGAL/vtk.module index 24c9f3d951..39e31f2d0c 100644 --- a/Plugins/CGAL/CGALFilters/vtk.module +++ b/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 diff --git a/Plugins/CGAL/CGALFilters/vtkCGAL3DPolyhedralMesher.cxx b/Plugins/CGAL/vtkCGAL/vtkCGAL3DPolyhedralMesher.cxx similarity index 100% rename from Plugins/CGAL/CGALFilters/vtkCGAL3DPolyhedralMesher.cxx rename to Plugins/CGAL/vtkCGAL/vtkCGAL3DPolyhedralMesher.cxx diff --git a/Plugins/CGAL/CGALFilters/vtkCGAL3DPolyhedralMesher.h b/Plugins/CGAL/vtkCGAL/vtkCGAL3DPolyhedralMesher.h similarity index 97% rename from Plugins/CGAL/CGALFilters/vtkCGAL3DPolyhedralMesher.h rename to Plugins/CGAL/vtkCGAL/vtkCGAL3DPolyhedralMesher.h index 6274c316e4..73d4adec9e 100644 --- a/Plugins/CGAL/CGALFilters/vtkCGAL3DPolyhedralMesher.h +++ b/Plugins/CGAL/vtkCGAL/vtkCGAL3DPolyhedralMesher.h @@ -2,11 +2,11 @@ #define vtkCGAL3DPolyhedralMesher_h #include "vtkPolyDataAlgorithm.h" -#include +#include class vtkPointSet; -class CGALFILTERS_EXPORT vtkCGAL3DPolyhedralMesher : public vtkPolyDataAlgorithm +class VTKCGAL_EXPORT vtkCGAL3DPolyhedralMesher : public vtkPolyDataAlgorithm { public: static vtkCGAL3DPolyhedralMesher* New(); diff --git a/Plugins/CGAL/CGALFilters/vtkCGALBoolean.cxx b/Plugins/CGAL/vtkCGAL/vtkCGALBoolean.cxx similarity index 100% rename from Plugins/CGAL/CGALFilters/vtkCGALBoolean.cxx rename to Plugins/CGAL/vtkCGAL/vtkCGALBoolean.cxx diff --git a/Plugins/CGAL/CGALFilters/vtkCGALBoolean.h b/Plugins/CGAL/vtkCGAL/vtkCGALBoolean.h similarity index 94% rename from Plugins/CGAL/CGALFilters/vtkCGALBoolean.h rename to Plugins/CGAL/vtkCGAL/vtkCGALBoolean.h index 07a52677b3..b65dd589a3 100644 --- a/Plugins/CGAL/CGALFilters/vtkCGALBoolean.h +++ b/Plugins/CGAL/vtkCGAL/vtkCGALBoolean.h @@ -4,14 +4,14 @@ #include "vtkPolyDataAlgorithm.h" #include #include -#include +#include class vtkPolyData; class vtkUnstructuredGrid; // Inherit from the desired filter -class CGALFILTERS_EXPORT vtkCGALBoolean : public vtkPolyDataAlgorithm +class VTKCGAL_EXPORT vtkCGALBoolean : public vtkPolyDataAlgorithm { public: // VTK requirements diff --git a/Plugins/CGAL/CGALFilters/vtkCGALFilters.xml b/Plugins/CGAL/vtkCGAL/vtkCGALPlugins.xml similarity index 100% rename from Plugins/CGAL/CGALFilters/vtkCGALFilters.xml rename to Plugins/CGAL/vtkCGAL/vtkCGALPlugins.xml