From d27ddae47ab0634116ac93e9e4efabe5952bb793 Mon Sep 17 00:00:00 2001 From: Utkarsh Ayachit <utkarsh.ayachit@kitware.com> Date: Wed, 3 Jan 2018 10:19:04 -0500 Subject: [PATCH] vtkImagingMath: update to the new module system --- Imaging/Math/CMakeLists.txt | 22 +++++++++++----------- Imaging/Math/module.cmake | 12 ------------ Imaging/Math/vtk.module | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 23 deletions(-) delete mode 100644 Imaging/Math/module.cmake create mode 100644 Imaging/Math/vtk.module diff --git a/Imaging/Math/CMakeLists.txt b/Imaging/Math/CMakeLists.txt index 85106ee12f8..5761a0dfead 100644 --- a/Imaging/Math/CMakeLists.txt +++ b/Imaging/Math/CMakeLists.txt @@ -1,12 +1,12 @@ -set(Module_SRCS - vtkImageDivergence.cxx - vtkImageDotProduct.cxx - vtkImageLogarithmicScale.cxx - vtkImageLogic.cxx - vtkImageMagnitude.cxx - vtkImageMaskBits.cxx - vtkImageMathematics.cxx - vtkImageWeightedSum.cxx - ) +set(classes + vtkImageDivergence + vtkImageDotProduct + vtkImageLogarithmicScale + vtkImageLogic + vtkImageMagnitude + vtkImageMaskBits + vtkImageMathematics + vtkImageWeightedSum) -vtk_module_library(${vtk-module} ${Module_SRCS}) +vtk_module_add_module(VTK::ImagingMath + CLASSES ${classes}) diff --git a/Imaging/Math/module.cmake b/Imaging/Math/module.cmake deleted file mode 100644 index 07392438cfa..00000000000 --- a/Imaging/Math/module.cmake +++ /dev/null @@ -1,12 +0,0 @@ -vtk_module(vtkImagingMath - GROUPS - Imaging - StandAlone - KIT - vtkImaging - DEPENDS - vtkCommonExecutionModel - PRIVATE_DEPENDS - vtkCommonCore - vtkCommonDataModel - ) \ No newline at end of file diff --git a/Imaging/Math/vtk.module b/Imaging/Math/vtk.module new file mode 100644 index 00000000000..cdc031e6f3a --- /dev/null +++ b/Imaging/Math/vtk.module @@ -0,0 +1,14 @@ +NAME + VTK::ImagingMath +LIBRARY_NAME + vtkImagingMath +KIT + VTK::Imaging +GROUPS + Imaging + StandAlone +DEPENDS + VTK::CommonExecutionModel +PRIVATE_DEPENDS + VTK::CommonCore + VTK::CommonDataModel -- GitLab