diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cf17dc27fb33fcbe613ae9f7e9ae2600f2194dc..b1bd21e8b66e18f9797b86a57783e219553b4650 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.8) -project (vtkCGAL) +project (vespa) ## Config @@ -40,7 +40,7 @@ endif() ## VTK Module -vtk_module_find_modules(vtkcgal_module_files "${CMAKE_CURRENT_SOURCE_DIR}/vtkCGAL") +vtk_module_find_modules(vtkcgal_module_files "${CMAKE_CURRENT_SOURCE_DIR}/vespa") vtk_module_scan( MODULE_FILES ${vtkcgal_module_files} @@ -52,24 +52,24 @@ vtk_module_python_default_destination(python_destination) vtk_module_build( MODULES ${vtkcgal_provided_modules} - INSTALL_EXPORT vtkCGAL + INSTALL_EXPORT vespa INSTALL_HEADERS ON - CMAKE_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vtkCGAL" + CMAKE_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vespa" HEADERS_DESTINATION "include") ## Install -set(vtkCGALExport ${vtkcgal_provided_modules}) +set(vespaExport ${vtkcgal_provided_modules}) export( - TARGETS ${vtkCGALExport} + TARGETS ${vespaExport} NAMESPACE VTK:: - FILE "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/vtkCGAL/vtkCGAL-targets.cmake") + FILE "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/vespa/vespa-targets.cmake") install( - EXPORT vtkCGAL + EXPORT vespa NAMESPACE VTK:: - FILE vtkCGAL-targets.cmake - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vtkCGAL") + FILE vespa-targets.cmake + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vespa") ## Python wrapping @@ -81,11 +81,11 @@ if(BUILD_PYTHON_WRAPPERS) vtk_module_wrap_python( MODULES ${vtkcgal_provided_modules} WRAPPED_MODULES vtkcgal_wrapped_modules - TARGET VTKCGAL::Python - INSTALL_EXPORT vtkCGALPython - PYTHON_PACKAGE "vtkCGAL" + TARGET VESPA::Python + INSTALL_EXPORT vespaPython + PYTHON_PACKAGE "vespa" MODULE_DESTINATION "${python_destination}" - CMAKE_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vtkCGALPython" + CMAKE_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vespaPython" LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}" INSTALL_HEADERS ON BUILD_STATIC OFF) @@ -99,22 +99,22 @@ if(BUILD_PYTHON_WRAPPERS) set(InitContent "__all__ = ${python_modules}") file(GENERATE - OUTPUT "${CMAKE_BINARY_DIR}/${python_destination}/vtkCGAL/__init__.py" + OUTPUT "${CMAKE_BINARY_DIR}/${python_destination}/vespa/__init__.py" CONTENT "${InitContent}") install( - FILES "${CMAKE_BINARY_DIR}/${python_destination}/vtkCGAL/__init__.py" - DESTINATION "${python_destination}/vtkCGAL/") + FILES "${CMAKE_BINARY_DIR}/${python_destination}/vespa/__init__.py" + DESTINATION "${python_destination}/vespa/") - # Install vtkCGALPython + # Install vespaPython export( - EXPORT vtkCGALPython - NAMESPACE VTKCGAL:: - FILE "${CMAKE_BINARY_DIR}/${python_destination}/vtkCGALPython/vtkCGALPython-targets.cmake") + EXPORT vespaPython + NAMESPACE VESPA:: + FILE "${CMAKE_BINARY_DIR}/${python_destination}/vespaPython/vespaPython-targets.cmake") install( - EXPORT vtkCGALPython - NAMESPACE VTKCGAL:: - FILE vtkCGALPython-targets.cmake - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vtkCGALPython") + EXPORT vespaPython + NAMESPACE VESPA:: + FILE vespaPython-targets.cmake + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/vespaPython") endif() diff --git a/README.md b/README.md index 7c8885f60d805f2ce10f10e697ace93262c0a5f1..bbe3d17b0ad2a8a979c9aa4e5b2c31d0ba78a366 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -[![pipeline status](https://gitlab.kitware.com/vtk-cgal/vtk-cgal/badges/master/pipeline.svg)](https://gitlab.kitware.com/vtk-cgal/vtk-cgal/-/commits/master) +[![pipeline status](https://gitlab.kitware.com/vtk-cgal/vespa/badges/master/pipeline.svg)](https://gitlab.kitware.com/vtk-cgal/vespa/-/commits/master) + +(V)TK (E)nhanced with (S)urface (P)rocessing (A)lgorithms # Brief @@ -9,7 +11,7 @@ CGAL, any binary generated with it retains the GPLv3 license. # How to install -The vtkCGAL project requires the [CMake](https://cmake.org/) build system, the [VTK library](https://vtk.org/) +The VESPA project requires the [CMake](https://cmake.org/) build system, the [VTK library](https://vtk.org/) and the [CGAL library](https://www.cgal.org/) on your system. ### VTK @@ -24,7 +26,7 @@ We need CGAL >= 5.3. It can be installed: * using the package manager of your system (including brew on OSX, or vcpkg on Windows), * manually using [CMake instructions](https://doc.cgal.org/latest/Manual/installation.html#installation_configwithcmake). -### vtkCGAL +### VESPA Then, we can install this project using the standard CMake procedure: diff --git a/vtkCGAL/PolygonMeshProcessing/CMakeLists.txt b/vespa/PolygonMeshProcessing/CMakeLists.txt similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/CMakeLists.txt rename to vespa/PolygonMeshProcessing/CMakeLists.txt diff --git a/vtkCGAL/PolygonMeshProcessing/Testing/CMakeLists.txt b/vespa/PolygonMeshProcessing/Testing/CMakeLists.txt similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/Testing/CMakeLists.txt rename to vespa/PolygonMeshProcessing/Testing/CMakeLists.txt diff --git a/vtkCGAL/PolygonMeshProcessing/Testing/TestPMPBooleanExecution.cxx b/vespa/PolygonMeshProcessing/Testing/TestPMPBooleanExecution.cxx similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/Testing/TestPMPBooleanExecution.cxx rename to vespa/PolygonMeshProcessing/Testing/TestPMPBooleanExecution.cxx diff --git a/vtkCGAL/PolygonMeshProcessing/Testing/TestPMPDeformExecution.cxx b/vespa/PolygonMeshProcessing/Testing/TestPMPDeformExecution.cxx similarity index 97% rename from vtkCGAL/PolygonMeshProcessing/Testing/TestPMPDeformExecution.cxx rename to vespa/PolygonMeshProcessing/Testing/TestPMPDeformExecution.cxx index 7d34a9548d282ee5d639e4eda4bc97b2e032692b..7b54b65b268932e4e2fdbfa0b5cf19e083a9e624 100644 --- a/vtkCGAL/PolygonMeshProcessing/Testing/TestPMPDeformExecution.cxx +++ b/vespa/PolygonMeshProcessing/Testing/TestPMPDeformExecution.cxx @@ -61,7 +61,7 @@ int TestPMPDeformExecution(int, char* argv[]) vtkNew arr; arr->SetNumberOfTuples(roiArr->GetNumberOfTuples()); - for (std::size_t idx = 0; idx < roiArr->GetNumberOfTuples(); ++idx) + for (vtkIdType idx = 0; idx < roiArr->GetNumberOfTuples(); ++idx) { arr->SetValue(idx, roiArr->GetValue(idx)); } diff --git a/vtkCGAL/PolygonMeshProcessing/Testing/TestPMPFairExecution.cxx b/vespa/PolygonMeshProcessing/Testing/TestPMPFairExecution.cxx similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/Testing/TestPMPFairExecution.cxx rename to vespa/PolygonMeshProcessing/Testing/TestPMPFairExecution.cxx diff --git a/vtkCGAL/PolygonMeshProcessing/Testing/TestPMPFillExecution.cxx b/vespa/PolygonMeshProcessing/Testing/TestPMPFillExecution.cxx similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/Testing/TestPMPFillExecution.cxx rename to vespa/PolygonMeshProcessing/Testing/TestPMPFillExecution.cxx diff --git a/vtkCGAL/PolygonMeshProcessing/Testing/TestPMPInstance.cxx b/vespa/PolygonMeshProcessing/Testing/TestPMPInstance.cxx similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/Testing/TestPMPInstance.cxx rename to vespa/PolygonMeshProcessing/Testing/TestPMPInstance.cxx diff --git a/vtkCGAL/PolygonMeshProcessing/Testing/TestPMPIsotropicExecution.cxx b/vespa/PolygonMeshProcessing/Testing/TestPMPIsotropicExecution.cxx similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/Testing/TestPMPIsotropicExecution.cxx rename to vespa/PolygonMeshProcessing/Testing/TestPMPIsotropicExecution.cxx diff --git a/vtkCGAL/PolygonMeshProcessing/Testing/execute_IsotropicRemesher.py b/vespa/PolygonMeshProcessing/Testing/execute_IsotropicRemesher.py similarity index 86% rename from vtkCGAL/PolygonMeshProcessing/Testing/execute_IsotropicRemesher.py rename to vespa/PolygonMeshProcessing/Testing/execute_IsotropicRemesher.py index c8f5879b2c413b57aa8e1d27910d65101d388bab..b3359442c1bc69f866c09622afd5670509fd6d5d 100644 --- a/vtkCGAL/PolygonMeshProcessing/Testing/execute_IsotropicRemesher.py +++ b/vespa/PolygonMeshProcessing/Testing/execute_IsotropicRemesher.py @@ -1,5 +1,5 @@ from vtk import vtkSphereSource -from vtkCGAL import vtkCGALPMP +from vespa import vtkCGALPMP pd = vtkSphereSource() diff --git a/vtkCGAL/PolygonMeshProcessing/Testing/import_vtkCGALPMP.py b/vespa/PolygonMeshProcessing/Testing/import_vtkCGALPMP.py similarity index 85% rename from vtkCGAL/PolygonMeshProcessing/Testing/import_vtkCGALPMP.py rename to vespa/PolygonMeshProcessing/Testing/import_vtkCGALPMP.py index 7c9f9552fb334216f88191dd15801695a70a8c24..9f01bd5273a5ae46440746ea75a1c135d674bc7c 100644 --- a/vtkCGAL/PolygonMeshProcessing/Testing/import_vtkCGALPMP.py +++ b/vespa/PolygonMeshProcessing/Testing/import_vtkCGALPMP.py @@ -1,9 +1,9 @@ # Global import -import vtkCGAL +import vespa import vtkmodules.vtkCommonCore # Specific import -from vtkCGAL import vtkCGALPMP +from vespa import vtkCGALPMP bo = vtkCGALPMP.vtkCGALBooleanOperation() help(bo) diff --git a/vtkCGAL/PolygonMeshProcessing/vtk.module b/vespa/PolygonMeshProcessing/vtk.module similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtk.module rename to vespa/PolygonMeshProcessing/vtk.module diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALBooleanOperation.cxx b/vespa/PolygonMeshProcessing/vtkCGALBooleanOperation.cxx similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALBooleanOperation.cxx rename to vespa/PolygonMeshProcessing/vtkCGALBooleanOperation.cxx diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALBooleanOperation.h b/vespa/PolygonMeshProcessing/vtkCGALBooleanOperation.h similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALBooleanOperation.h rename to vespa/PolygonMeshProcessing/vtkCGALBooleanOperation.h diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALIsotropicRemesher.cxx b/vespa/PolygonMeshProcessing/vtkCGALIsotropicRemesher.cxx similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALIsotropicRemesher.cxx rename to vespa/PolygonMeshProcessing/vtkCGALIsotropicRemesher.cxx diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALIsotropicRemesher.h b/vespa/PolygonMeshProcessing/vtkCGALIsotropicRemesher.h similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALIsotropicRemesher.h rename to vespa/PolygonMeshProcessing/vtkCGALIsotropicRemesher.h diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALMeshDeformation.cxx b/vespa/PolygonMeshProcessing/vtkCGALMeshDeformation.cxx similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALMeshDeformation.cxx rename to vespa/PolygonMeshProcessing/vtkCGALMeshDeformation.cxx diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALMeshDeformation.h b/vespa/PolygonMeshProcessing/vtkCGALMeshDeformation.h similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALMeshDeformation.h rename to vespa/PolygonMeshProcessing/vtkCGALMeshDeformation.h diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALPatchFilling.cxx b/vespa/PolygonMeshProcessing/vtkCGALPatchFilling.cxx similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALPatchFilling.cxx rename to vespa/PolygonMeshProcessing/vtkCGALPatchFilling.cxx diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALPatchFilling.h b/vespa/PolygonMeshProcessing/vtkCGALPatchFilling.h similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALPatchFilling.h rename to vespa/PolygonMeshProcessing/vtkCGALPatchFilling.h diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALPolyDataAlgorithm.cxx b/vespa/PolygonMeshProcessing/vtkCGALPolyDataAlgorithm.cxx similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALPolyDataAlgorithm.cxx rename to vespa/PolygonMeshProcessing/vtkCGALPolyDataAlgorithm.cxx diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALPolyDataAlgorithm.h b/vespa/PolygonMeshProcessing/vtkCGALPolyDataAlgorithm.h similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALPolyDataAlgorithm.h rename to vespa/PolygonMeshProcessing/vtkCGALPolyDataAlgorithm.h diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALRegionFairing.cxx b/vespa/PolygonMeshProcessing/vtkCGALRegionFairing.cxx similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALRegionFairing.cxx rename to vespa/PolygonMeshProcessing/vtkCGALRegionFairing.cxx diff --git a/vtkCGAL/PolygonMeshProcessing/vtkCGALRegionFairing.h b/vespa/PolygonMeshProcessing/vtkCGALRegionFairing.h similarity index 100% rename from vtkCGAL/PolygonMeshProcessing/vtkCGALRegionFairing.h rename to vespa/PolygonMeshProcessing/vtkCGALRegionFairing.h