From 77cd7c918643b6e407a6f13a84001fcdcb8b3985 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Thu, 15 Feb 2024 00:28:10 +0800 Subject: [PATCH] First working version --- CMakeLists.txt | 20 +++++++- VTKExtensions/CMakeLists.txt | 2 + .../private}/Applicative/CMakeLists.txt | 0 .../Applicative/Testing/CMakeLists.txt | 0 .../Testing/TestF3DObjectFactory.cxx | 0 .../Testing/TestF3DWinGuiObjectFactory.cxx | 0 .../private}/Applicative/vtk.module | 0 .../Applicative/vtkF3DObjectFactory.cxx | 0 .../Applicative/vtkF3DObjectFactory.h | 0 .../private}/CMakeLists.txt | 14 +++--- .../private}/Core/CMakeLists.txt | 0 .../private}/Core/F3DLog.cxx | 0 .../private}/Core/F3DLog.h | 0 .../private}/Core/Testing/CMakeLists.txt | 0 .../private/Core}/Testing/TestF3DLog.cxx | 0 .../private}/Core/vtk.module | 0 .../Core/vtkF3DAndroidLogOutputWindow.cxx | 0 .../Core/vtkF3DAndroidLogOutputWindow.h | 0 .../private}/Core/vtkF3DConfigure.h.in | 0 .../Core/vtkF3DConsoleOutputWindow.cxx | 0 .../private}/Core/vtkF3DConsoleOutputWindow.h | 0 .../private}/Core/vtkF3DWin32OutputWindow.cxx | 0 .../private}/Core/vtkF3DWin32OutputWindow.h | 0 .../private}/Readers/CMakeLists.txt | 0 .../private}/Readers/Testing/CMakeLists.txt | 0 .../Readers/Testing/TestF3DEXRReader.cxx | 0 .../Testing/TestF3DEXRReaderInvalid.cxx | 0 .../Testing/TestF3DGenericImporter.cxx | 0 .../TestF3DGenericImporterMultiColoring.cxx | 0 .../private}/Readers/vtk.module | 0 .../private}/Readers/vtkF3DEXRReader.cxx | 0 .../private}/Readers/vtkF3DEXRReader.h | 0 .../Readers/vtkF3DGenericImporter.cxx | 0 .../private}/Readers/vtkF3DGenericImporter.h | 0 .../private}/Readers/vtkF3DMemoryMesh.cxx | 0 .../private}/Readers/vtkF3DMemoryMesh.h | 0 .../Readers/vtkF3DPostProcessFilter.cxx | 0 .../Readers/vtkF3DPostProcessFilter.h | 0 .../private}/Rendering/CMakeLists.txt | 0 .../private}/Rendering/Testing/CMakeLists.txt | 0 .../Rendering/Testing/TestF3DBitonicSort.cxx | 0 .../Testing/TestF3DCachedTexturesPrint.cxx | 0 .../TestF3DInteractorEventRecorder.cxx | 0 .../Testing/TestF3DOpenGLGridMapper.cxx | 0 .../Rendering/Testing/TestF3DRenderPass.cxx | 0 .../Testing/TestF3DRendererWithColoring.cxx | 0 .../glsl/vtkF3DBitonicSortFunctions.glsl | 0 .../vtkF3DBitonicSortGlobalDisperseCS.glsl | 0 .../glsl/vtkF3DBitonicSortGlobalFlipCS.glsl | 0 .../vtkF3DBitonicSortLocalDisperseCS.glsl | 0 .../glsl/vtkF3DBitonicSortLocalSortCS.glsl | 0 .../Rendering/glsl/vtkF3DComputeDepthCS.glsl | 0 .../private}/Rendering/vtk.module | 0 .../private}/Rendering/vtkF3DBitonicSort.cxx | 0 .../private}/Rendering/vtkF3DBitonicSort.h | 0 .../Rendering/vtkF3DCachedLUTTexture.cxx | 0 .../Rendering/vtkF3DCachedLUTTexture.h | 0 .../Rendering/vtkF3DCachedSpecularTexture.cxx | 0 .../Rendering/vtkF3DCachedSpecularTexture.h | 0 .../Rendering/vtkF3DDropZoneActor.cxx | 0 .../private}/Rendering/vtkF3DDropZoneActor.h | 0 .../vtkF3DHexagonalBokehBlurPass.cxx | 0 .../Rendering/vtkF3DHexagonalBokehBlurPass.h | 0 .../vtkF3DInteractorEventRecorder.cxx | 0 .../Rendering/vtkF3DInteractorEventRecorder.h | 0 .../Rendering/vtkF3DInteractorStyle.cxx | 0 .../Rendering/vtkF3DInteractorStyle.h | 0 .../Rendering/vtkF3DNoRenderWindow.cxx | 0 .../private}/Rendering/vtkF3DNoRenderWindow.h | 0 .../Rendering/vtkF3DOpenGLGridMapper.cxx | 0 .../Rendering/vtkF3DOpenGLGridMapper.h | 0 .../vtkF3DOrientationMarkerWidget.cxx | 0 .../Rendering/vtkF3DOrientationMarkerWidget.h | 0 .../Rendering/vtkF3DPointSplatMapper.cxx | 0 .../Rendering/vtkF3DPointSplatMapper.h | 0 .../Rendering/vtkF3DPolyDataMapper.cxx | 0 .../private}/Rendering/vtkF3DPolyDataMapper.h | 0 .../private}/Rendering/vtkF3DRenderPass.cxx | 0 .../private}/Rendering/vtkF3DRenderPass.h | 0 .../private}/Rendering/vtkF3DRenderer.cxx | 0 .../private}/Rendering/vtkF3DRenderer.h | 0 .../Rendering/vtkF3DRendererWithColoring.cxx | 0 .../Rendering/vtkF3DRendererWithColoring.h | 0 .../public}/CMakeLists.txt | 21 +++++---- .../public}/module/CMakeLists.txt | 2 +- .../public}/module/Testing/CMakeLists.txt | 0 .../public}/module/vtk.module | 4 +- .../vtkF3DFaceVaryingPointDispatcher.cxx | 0 .../module/vtkF3DFaceVaryingPointDispatcher.h | 4 +- cmake/f3dPlugin.cmake | 9 ++-- library/CMakeLists.txt | 33 +++++-------- .../VTKExtensions/Core/Testing/TestF3DLog.cxx | 47 ------------------- library/src/engine.cxx | 4 ++ plugins/native/module/vtk.module | 1 - plugins/usd/module/vtk.module | 2 +- 95 files changed, 67 insertions(+), 96 deletions(-) create mode 100644 VTKExtensions/CMakeLists.txt rename {library/VTKExtensions => VTKExtensions/private}/Applicative/CMakeLists.txt (100%) rename {library/VTKExtensions => VTKExtensions/private}/Applicative/Testing/CMakeLists.txt (100%) rename {library/VTKExtensions => VTKExtensions/private}/Applicative/Testing/TestF3DObjectFactory.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Applicative/Testing/TestF3DWinGuiObjectFactory.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Applicative/vtk.module (100%) rename {library/VTKExtensions => VTKExtensions/private}/Applicative/vtkF3DObjectFactory.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Applicative/vtkF3DObjectFactory.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/CMakeLists.txt (75%) rename {library/VTKExtensions => VTKExtensions/private}/Core/CMakeLists.txt (100%) rename {library/VTKExtensions => VTKExtensions/private}/Core/F3DLog.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Core/F3DLog.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Core/Testing/CMakeLists.txt (100%) rename {VTKShared/module => VTKExtensions/private/Core}/Testing/TestF3DLog.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Core/vtk.module (100%) rename {library/VTKExtensions => VTKExtensions/private}/Core/vtkF3DAndroidLogOutputWindow.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Core/vtkF3DAndroidLogOutputWindow.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Core/vtkF3DConfigure.h.in (100%) rename {library/VTKExtensions => VTKExtensions/private}/Core/vtkF3DConsoleOutputWindow.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Core/vtkF3DConsoleOutputWindow.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Core/vtkF3DWin32OutputWindow.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Core/vtkF3DWin32OutputWindow.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/CMakeLists.txt (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/Testing/CMakeLists.txt (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/Testing/TestF3DEXRReader.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/Testing/TestF3DEXRReaderInvalid.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/Testing/TestF3DGenericImporter.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/Testing/TestF3DGenericImporterMultiColoring.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/vtk.module (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/vtkF3DEXRReader.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/vtkF3DEXRReader.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/vtkF3DGenericImporter.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/vtkF3DGenericImporter.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/vtkF3DMemoryMesh.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/vtkF3DMemoryMesh.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/vtkF3DPostProcessFilter.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Readers/vtkF3DPostProcessFilter.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/CMakeLists.txt (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/Testing/CMakeLists.txt (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/Testing/TestF3DBitonicSort.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/Testing/TestF3DCachedTexturesPrint.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/Testing/TestF3DInteractorEventRecorder.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/Testing/TestF3DOpenGLGridMapper.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/Testing/TestF3DRenderPass.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/Testing/TestF3DRendererWithColoring.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/glsl/vtkF3DBitonicSortFunctions.glsl (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/glsl/vtkF3DBitonicSortGlobalDisperseCS.glsl (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/glsl/vtkF3DBitonicSortGlobalFlipCS.glsl (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/glsl/vtkF3DBitonicSortLocalDisperseCS.glsl (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/glsl/vtkF3DBitonicSortLocalSortCS.glsl (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/glsl/vtkF3DComputeDepthCS.glsl (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtk.module (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DBitonicSort.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DBitonicSort.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DCachedLUTTexture.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DCachedLUTTexture.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DCachedSpecularTexture.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DCachedSpecularTexture.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DDropZoneActor.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DDropZoneActor.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DHexagonalBokehBlurPass.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DHexagonalBokehBlurPass.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DInteractorEventRecorder.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DInteractorEventRecorder.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DInteractorStyle.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DInteractorStyle.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DNoRenderWindow.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DNoRenderWindow.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DOpenGLGridMapper.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DOpenGLGridMapper.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DOrientationMarkerWidget.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DOrientationMarkerWidget.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DPointSplatMapper.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DPointSplatMapper.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DPolyDataMapper.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DPolyDataMapper.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DRenderPass.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DRenderPass.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DRenderer.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DRenderer.h (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DRendererWithColoring.cxx (100%) rename {library/VTKExtensions => VTKExtensions/private}/Rendering/vtkF3DRendererWithColoring.h (100%) rename {VTKShared => VTKExtensions/public}/CMakeLists.txt (60%) rename {VTKShared => VTKExtensions/public}/module/CMakeLists.txt (61%) rename {VTKShared => VTKExtensions/public}/module/Testing/CMakeLists.txt (100%) rename {VTKShared => VTKExtensions/public}/module/vtk.module (55%) rename {VTKShared => VTKExtensions/public}/module/vtkF3DFaceVaryingPointDispatcher.cxx (100%) rename {VTKShared => VTKExtensions/public}/module/vtkF3DFaceVaryingPointDispatcher.h (91%) delete mode 100644 library/VTKExtensions/Core/Testing/TestF3DLog.cxx diff --git a/CMakeLists.txt b/CMakeLists.txt index 84383ffdaa..a750925af3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,6 +158,22 @@ if(NOT F3D_SANITIZER STREQUAL "none") set(f3d_sanitizer_link_options -fsanitize=${F3D_SANITIZER}) endif() +# Construct generic build and link options +set(f3d_compile_options_private "") +set(f3d_compile_options_public "") +set(f3d_link_options_public "") + +## F3D_STRICT_BUILD +list(APPEND f3d_compile_options_private ${f3d_strict_build_compile_options}) + +## Coverage +list(APPEND f3d_compile_options_public ${f3d_coverage_compile_options}) +list(APPEND f3d_link_options_public ${f3d_coverage_link_options}) + +## Sanitizer +list(APPEND f3d_compile_options_public ${f3d_sanitizer_compile_options}) +list(APPEND f3d_link_options_public ${f3d_sanitizer_link_options}) + # Testing option(BUILD_TESTING "Build the tests" OFF) cmake_dependent_option(F3D_TESTING_DISABLE_DEFAULT_LIGHTS_TESTS_COMPARISON "Disable image comparison on tests using the default lights" OFF "BUILD_TESTING" OFF) @@ -189,8 +205,8 @@ endif() # F3D Application cmake_dependent_option(F3D_BUILD_APPLICATION "Build the application" ON "NOT ANDROID AND NOT EMSCRIPTEN" OFF) -# VTKShared module -add_subdirectory(VTKShared) +# Build VTK extension moddules +add_subdirectory(VTKExtensions) # plugins option(F3D_PLUGINS_STATIC_BUILD "Make all plugins static (embedded into libf3d) and automatically loaded by F3D" ON) diff --git a/VTKExtensions/CMakeLists.txt b/VTKExtensions/CMakeLists.txt new file mode 100644 index 0000000000..751cb90aaf --- /dev/null +++ b/VTKExtensions/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(public) +add_subdirectory(private) diff --git a/library/VTKExtensions/Applicative/CMakeLists.txt b/VTKExtensions/private/Applicative/CMakeLists.txt similarity index 100% rename from library/VTKExtensions/Applicative/CMakeLists.txt rename to VTKExtensions/private/Applicative/CMakeLists.txt diff --git a/library/VTKExtensions/Applicative/Testing/CMakeLists.txt b/VTKExtensions/private/Applicative/Testing/CMakeLists.txt similarity index 100% rename from library/VTKExtensions/Applicative/Testing/CMakeLists.txt rename to VTKExtensions/private/Applicative/Testing/CMakeLists.txt diff --git a/library/VTKExtensions/Applicative/Testing/TestF3DObjectFactory.cxx b/VTKExtensions/private/Applicative/Testing/TestF3DObjectFactory.cxx similarity index 100% rename from library/VTKExtensions/Applicative/Testing/TestF3DObjectFactory.cxx rename to VTKExtensions/private/Applicative/Testing/TestF3DObjectFactory.cxx diff --git a/library/VTKExtensions/Applicative/Testing/TestF3DWinGuiObjectFactory.cxx b/VTKExtensions/private/Applicative/Testing/TestF3DWinGuiObjectFactory.cxx similarity index 100% rename from library/VTKExtensions/Applicative/Testing/TestF3DWinGuiObjectFactory.cxx rename to VTKExtensions/private/Applicative/Testing/TestF3DWinGuiObjectFactory.cxx diff --git a/library/VTKExtensions/Applicative/vtk.module b/VTKExtensions/private/Applicative/vtk.module similarity index 100% rename from library/VTKExtensions/Applicative/vtk.module rename to VTKExtensions/private/Applicative/vtk.module diff --git a/library/VTKExtensions/Applicative/vtkF3DObjectFactory.cxx b/VTKExtensions/private/Applicative/vtkF3DObjectFactory.cxx similarity index 100% rename from library/VTKExtensions/Applicative/vtkF3DObjectFactory.cxx rename to VTKExtensions/private/Applicative/vtkF3DObjectFactory.cxx diff --git a/library/VTKExtensions/Applicative/vtkF3DObjectFactory.h b/VTKExtensions/private/Applicative/vtkF3DObjectFactory.h similarity index 100% rename from library/VTKExtensions/Applicative/vtkF3DObjectFactory.h rename to VTKExtensions/private/Applicative/vtkF3DObjectFactory.h diff --git a/library/VTKExtensions/CMakeLists.txt b/VTKExtensions/private/CMakeLists.txt similarity index 75% rename from library/VTKExtensions/CMakeLists.txt rename to VTKExtensions/private/CMakeLists.txt index 119d3cff03..9079a5ff6a 100644 --- a/library/VTKExtensions/CMakeLists.txt +++ b/VTKExtensions/private/CMakeLists.txt @@ -26,19 +26,19 @@ vtk_module_build( INSTALL_HEADERS OFF HEADERS_COMPONENT vtkext TARGETS_COMPONENT vtkext - PACKAGE "f3d-VTKExtensions") + PACKAGE "f3d-VTKExtensionsPrivate") # We need non empty cmake vars for these calls for VTK <= 9.1 # See https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9084 foreach (module IN LISTS modules) - if(NOT "${libf3d_compile_options_public}" STREQUAL "") - vtk_module_compile_options(${module} PUBLIC ${libf3d_compile_options_public}) + if(NOT "${f3d_compile_options_public}" STREQUAL "") + vtk_module_compile_options(${module} PUBLIC ${f3d_compile_options_public}) endif() - if(NOT "${libf3d_compile_options_private}" STREQUAL "") - vtk_module_compile_options(${module} PRIVATE ${libf3d_compile_options_private}) + if(NOT "${f3d_compile_options_private}" STREQUAL "") + vtk_module_compile_options(${module} PRIVATE ${f3d_compile_options_private}) endif() - if (NOT "${libf3d_link_options_public}" STREQUAL "") - vtk_module_link_options(${module} PUBLIC ${libf3d_link_options_public}) + if (NOT "${f3d_link_options_public}" STREQUAL "") + vtk_module_link_options(${module} PUBLIC ${f3d_link_options_public}) endif() vtk_module_set_property(${module} PROPERTY CXX_STANDARD VALUE 17) if(F3D_STRICT_BUILD AND MSVC) diff --git a/library/VTKExtensions/Core/CMakeLists.txt b/VTKExtensions/private/Core/CMakeLists.txt similarity index 100% rename from library/VTKExtensions/Core/CMakeLists.txt rename to VTKExtensions/private/Core/CMakeLists.txt diff --git a/library/VTKExtensions/Core/F3DLog.cxx b/VTKExtensions/private/Core/F3DLog.cxx similarity index 100% rename from library/VTKExtensions/Core/F3DLog.cxx rename to VTKExtensions/private/Core/F3DLog.cxx diff --git a/library/VTKExtensions/Core/F3DLog.h b/VTKExtensions/private/Core/F3DLog.h similarity index 100% rename from library/VTKExtensions/Core/F3DLog.h rename to VTKExtensions/private/Core/F3DLog.h diff --git a/library/VTKExtensions/Core/Testing/CMakeLists.txt b/VTKExtensions/private/Core/Testing/CMakeLists.txt similarity index 100% rename from library/VTKExtensions/Core/Testing/CMakeLists.txt rename to VTKExtensions/private/Core/Testing/CMakeLists.txt diff --git a/VTKShared/module/Testing/TestF3DLog.cxx b/VTKExtensions/private/Core/Testing/TestF3DLog.cxx similarity index 100% rename from VTKShared/module/Testing/TestF3DLog.cxx rename to VTKExtensions/private/Core/Testing/TestF3DLog.cxx diff --git a/library/VTKExtensions/Core/vtk.module b/VTKExtensions/private/Core/vtk.module similarity index 100% rename from library/VTKExtensions/Core/vtk.module rename to VTKExtensions/private/Core/vtk.module diff --git a/library/VTKExtensions/Core/vtkF3DAndroidLogOutputWindow.cxx b/VTKExtensions/private/Core/vtkF3DAndroidLogOutputWindow.cxx similarity index 100% rename from library/VTKExtensions/Core/vtkF3DAndroidLogOutputWindow.cxx rename to VTKExtensions/private/Core/vtkF3DAndroidLogOutputWindow.cxx diff --git a/library/VTKExtensions/Core/vtkF3DAndroidLogOutputWindow.h b/VTKExtensions/private/Core/vtkF3DAndroidLogOutputWindow.h similarity index 100% rename from library/VTKExtensions/Core/vtkF3DAndroidLogOutputWindow.h rename to VTKExtensions/private/Core/vtkF3DAndroidLogOutputWindow.h diff --git a/library/VTKExtensions/Core/vtkF3DConfigure.h.in b/VTKExtensions/private/Core/vtkF3DConfigure.h.in similarity index 100% rename from library/VTKExtensions/Core/vtkF3DConfigure.h.in rename to VTKExtensions/private/Core/vtkF3DConfigure.h.in diff --git a/library/VTKExtensions/Core/vtkF3DConsoleOutputWindow.cxx b/VTKExtensions/private/Core/vtkF3DConsoleOutputWindow.cxx similarity index 100% rename from library/VTKExtensions/Core/vtkF3DConsoleOutputWindow.cxx rename to VTKExtensions/private/Core/vtkF3DConsoleOutputWindow.cxx diff --git a/library/VTKExtensions/Core/vtkF3DConsoleOutputWindow.h b/VTKExtensions/private/Core/vtkF3DConsoleOutputWindow.h similarity index 100% rename from library/VTKExtensions/Core/vtkF3DConsoleOutputWindow.h rename to VTKExtensions/private/Core/vtkF3DConsoleOutputWindow.h diff --git a/library/VTKExtensions/Core/vtkF3DWin32OutputWindow.cxx b/VTKExtensions/private/Core/vtkF3DWin32OutputWindow.cxx similarity index 100% rename from library/VTKExtensions/Core/vtkF3DWin32OutputWindow.cxx rename to VTKExtensions/private/Core/vtkF3DWin32OutputWindow.cxx diff --git a/library/VTKExtensions/Core/vtkF3DWin32OutputWindow.h b/VTKExtensions/private/Core/vtkF3DWin32OutputWindow.h similarity index 100% rename from library/VTKExtensions/Core/vtkF3DWin32OutputWindow.h rename to VTKExtensions/private/Core/vtkF3DWin32OutputWindow.h diff --git a/library/VTKExtensions/Readers/CMakeLists.txt b/VTKExtensions/private/Readers/CMakeLists.txt similarity index 100% rename from library/VTKExtensions/Readers/CMakeLists.txt rename to VTKExtensions/private/Readers/CMakeLists.txt diff --git a/library/VTKExtensions/Readers/Testing/CMakeLists.txt b/VTKExtensions/private/Readers/Testing/CMakeLists.txt similarity index 100% rename from library/VTKExtensions/Readers/Testing/CMakeLists.txt rename to VTKExtensions/private/Readers/Testing/CMakeLists.txt diff --git a/library/VTKExtensions/Readers/Testing/TestF3DEXRReader.cxx b/VTKExtensions/private/Readers/Testing/TestF3DEXRReader.cxx similarity index 100% rename from library/VTKExtensions/Readers/Testing/TestF3DEXRReader.cxx rename to VTKExtensions/private/Readers/Testing/TestF3DEXRReader.cxx diff --git a/library/VTKExtensions/Readers/Testing/TestF3DEXRReaderInvalid.cxx b/VTKExtensions/private/Readers/Testing/TestF3DEXRReaderInvalid.cxx similarity index 100% rename from library/VTKExtensions/Readers/Testing/TestF3DEXRReaderInvalid.cxx rename to VTKExtensions/private/Readers/Testing/TestF3DEXRReaderInvalid.cxx diff --git a/library/VTKExtensions/Readers/Testing/TestF3DGenericImporter.cxx b/VTKExtensions/private/Readers/Testing/TestF3DGenericImporter.cxx similarity index 100% rename from library/VTKExtensions/Readers/Testing/TestF3DGenericImporter.cxx rename to VTKExtensions/private/Readers/Testing/TestF3DGenericImporter.cxx diff --git a/library/VTKExtensions/Readers/Testing/TestF3DGenericImporterMultiColoring.cxx b/VTKExtensions/private/Readers/Testing/TestF3DGenericImporterMultiColoring.cxx similarity index 100% rename from library/VTKExtensions/Readers/Testing/TestF3DGenericImporterMultiColoring.cxx rename to VTKExtensions/private/Readers/Testing/TestF3DGenericImporterMultiColoring.cxx diff --git a/library/VTKExtensions/Readers/vtk.module b/VTKExtensions/private/Readers/vtk.module similarity index 100% rename from library/VTKExtensions/Readers/vtk.module rename to VTKExtensions/private/Readers/vtk.module diff --git a/library/VTKExtensions/Readers/vtkF3DEXRReader.cxx b/VTKExtensions/private/Readers/vtkF3DEXRReader.cxx similarity index 100% rename from library/VTKExtensions/Readers/vtkF3DEXRReader.cxx rename to VTKExtensions/private/Readers/vtkF3DEXRReader.cxx diff --git a/library/VTKExtensions/Readers/vtkF3DEXRReader.h b/VTKExtensions/private/Readers/vtkF3DEXRReader.h similarity index 100% rename from library/VTKExtensions/Readers/vtkF3DEXRReader.h rename to VTKExtensions/private/Readers/vtkF3DEXRReader.h diff --git a/library/VTKExtensions/Readers/vtkF3DGenericImporter.cxx b/VTKExtensions/private/Readers/vtkF3DGenericImporter.cxx similarity index 100% rename from library/VTKExtensions/Readers/vtkF3DGenericImporter.cxx rename to VTKExtensions/private/Readers/vtkF3DGenericImporter.cxx diff --git a/library/VTKExtensions/Readers/vtkF3DGenericImporter.h b/VTKExtensions/private/Readers/vtkF3DGenericImporter.h similarity index 100% rename from library/VTKExtensions/Readers/vtkF3DGenericImporter.h rename to VTKExtensions/private/Readers/vtkF3DGenericImporter.h diff --git a/library/VTKExtensions/Readers/vtkF3DMemoryMesh.cxx b/VTKExtensions/private/Readers/vtkF3DMemoryMesh.cxx similarity index 100% rename from library/VTKExtensions/Readers/vtkF3DMemoryMesh.cxx rename to VTKExtensions/private/Readers/vtkF3DMemoryMesh.cxx diff --git a/library/VTKExtensions/Readers/vtkF3DMemoryMesh.h b/VTKExtensions/private/Readers/vtkF3DMemoryMesh.h similarity index 100% rename from library/VTKExtensions/Readers/vtkF3DMemoryMesh.h rename to VTKExtensions/private/Readers/vtkF3DMemoryMesh.h diff --git a/library/VTKExtensions/Readers/vtkF3DPostProcessFilter.cxx b/VTKExtensions/private/Readers/vtkF3DPostProcessFilter.cxx similarity index 100% rename from library/VTKExtensions/Readers/vtkF3DPostProcessFilter.cxx rename to VTKExtensions/private/Readers/vtkF3DPostProcessFilter.cxx diff --git a/library/VTKExtensions/Readers/vtkF3DPostProcessFilter.h b/VTKExtensions/private/Readers/vtkF3DPostProcessFilter.h similarity index 100% rename from library/VTKExtensions/Readers/vtkF3DPostProcessFilter.h rename to VTKExtensions/private/Readers/vtkF3DPostProcessFilter.h diff --git a/library/VTKExtensions/Rendering/CMakeLists.txt b/VTKExtensions/private/Rendering/CMakeLists.txt similarity index 100% rename from library/VTKExtensions/Rendering/CMakeLists.txt rename to VTKExtensions/private/Rendering/CMakeLists.txt diff --git a/library/VTKExtensions/Rendering/Testing/CMakeLists.txt b/VTKExtensions/private/Rendering/Testing/CMakeLists.txt similarity index 100% rename from library/VTKExtensions/Rendering/Testing/CMakeLists.txt rename to VTKExtensions/private/Rendering/Testing/CMakeLists.txt diff --git a/library/VTKExtensions/Rendering/Testing/TestF3DBitonicSort.cxx b/VTKExtensions/private/Rendering/Testing/TestF3DBitonicSort.cxx similarity index 100% rename from library/VTKExtensions/Rendering/Testing/TestF3DBitonicSort.cxx rename to VTKExtensions/private/Rendering/Testing/TestF3DBitonicSort.cxx diff --git a/library/VTKExtensions/Rendering/Testing/TestF3DCachedTexturesPrint.cxx b/VTKExtensions/private/Rendering/Testing/TestF3DCachedTexturesPrint.cxx similarity index 100% rename from library/VTKExtensions/Rendering/Testing/TestF3DCachedTexturesPrint.cxx rename to VTKExtensions/private/Rendering/Testing/TestF3DCachedTexturesPrint.cxx diff --git a/library/VTKExtensions/Rendering/Testing/TestF3DInteractorEventRecorder.cxx b/VTKExtensions/private/Rendering/Testing/TestF3DInteractorEventRecorder.cxx similarity index 100% rename from library/VTKExtensions/Rendering/Testing/TestF3DInteractorEventRecorder.cxx rename to VTKExtensions/private/Rendering/Testing/TestF3DInteractorEventRecorder.cxx diff --git a/library/VTKExtensions/Rendering/Testing/TestF3DOpenGLGridMapper.cxx b/VTKExtensions/private/Rendering/Testing/TestF3DOpenGLGridMapper.cxx similarity index 100% rename from library/VTKExtensions/Rendering/Testing/TestF3DOpenGLGridMapper.cxx rename to VTKExtensions/private/Rendering/Testing/TestF3DOpenGLGridMapper.cxx diff --git a/library/VTKExtensions/Rendering/Testing/TestF3DRenderPass.cxx b/VTKExtensions/private/Rendering/Testing/TestF3DRenderPass.cxx similarity index 100% rename from library/VTKExtensions/Rendering/Testing/TestF3DRenderPass.cxx rename to VTKExtensions/private/Rendering/Testing/TestF3DRenderPass.cxx diff --git a/library/VTKExtensions/Rendering/Testing/TestF3DRendererWithColoring.cxx b/VTKExtensions/private/Rendering/Testing/TestF3DRendererWithColoring.cxx similarity index 100% rename from library/VTKExtensions/Rendering/Testing/TestF3DRendererWithColoring.cxx rename to VTKExtensions/private/Rendering/Testing/TestF3DRendererWithColoring.cxx diff --git a/library/VTKExtensions/Rendering/glsl/vtkF3DBitonicSortFunctions.glsl b/VTKExtensions/private/Rendering/glsl/vtkF3DBitonicSortFunctions.glsl similarity index 100% rename from library/VTKExtensions/Rendering/glsl/vtkF3DBitonicSortFunctions.glsl rename to VTKExtensions/private/Rendering/glsl/vtkF3DBitonicSortFunctions.glsl diff --git a/library/VTKExtensions/Rendering/glsl/vtkF3DBitonicSortGlobalDisperseCS.glsl b/VTKExtensions/private/Rendering/glsl/vtkF3DBitonicSortGlobalDisperseCS.glsl similarity index 100% rename from library/VTKExtensions/Rendering/glsl/vtkF3DBitonicSortGlobalDisperseCS.glsl rename to VTKExtensions/private/Rendering/glsl/vtkF3DBitonicSortGlobalDisperseCS.glsl diff --git a/library/VTKExtensions/Rendering/glsl/vtkF3DBitonicSortGlobalFlipCS.glsl b/VTKExtensions/private/Rendering/glsl/vtkF3DBitonicSortGlobalFlipCS.glsl similarity index 100% rename from library/VTKExtensions/Rendering/glsl/vtkF3DBitonicSortGlobalFlipCS.glsl rename to VTKExtensions/private/Rendering/glsl/vtkF3DBitonicSortGlobalFlipCS.glsl diff --git a/library/VTKExtensions/Rendering/glsl/vtkF3DBitonicSortLocalDisperseCS.glsl b/VTKExtensions/private/Rendering/glsl/vtkF3DBitonicSortLocalDisperseCS.glsl similarity index 100% rename from library/VTKExtensions/Rendering/glsl/vtkF3DBitonicSortLocalDisperseCS.glsl rename to VTKExtensions/private/Rendering/glsl/vtkF3DBitonicSortLocalDisperseCS.glsl diff --git a/library/VTKExtensions/Rendering/glsl/vtkF3DBitonicSortLocalSortCS.glsl b/VTKExtensions/private/Rendering/glsl/vtkF3DBitonicSortLocalSortCS.glsl similarity index 100% rename from library/VTKExtensions/Rendering/glsl/vtkF3DBitonicSortLocalSortCS.glsl rename to VTKExtensions/private/Rendering/glsl/vtkF3DBitonicSortLocalSortCS.glsl diff --git a/library/VTKExtensions/Rendering/glsl/vtkF3DComputeDepthCS.glsl b/VTKExtensions/private/Rendering/glsl/vtkF3DComputeDepthCS.glsl similarity index 100% rename from library/VTKExtensions/Rendering/glsl/vtkF3DComputeDepthCS.glsl rename to VTKExtensions/private/Rendering/glsl/vtkF3DComputeDepthCS.glsl diff --git a/library/VTKExtensions/Rendering/vtk.module b/VTKExtensions/private/Rendering/vtk.module similarity index 100% rename from library/VTKExtensions/Rendering/vtk.module rename to VTKExtensions/private/Rendering/vtk.module diff --git a/library/VTKExtensions/Rendering/vtkF3DBitonicSort.cxx b/VTKExtensions/private/Rendering/vtkF3DBitonicSort.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DBitonicSort.cxx rename to VTKExtensions/private/Rendering/vtkF3DBitonicSort.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DBitonicSort.h b/VTKExtensions/private/Rendering/vtkF3DBitonicSort.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DBitonicSort.h rename to VTKExtensions/private/Rendering/vtkF3DBitonicSort.h diff --git a/library/VTKExtensions/Rendering/vtkF3DCachedLUTTexture.cxx b/VTKExtensions/private/Rendering/vtkF3DCachedLUTTexture.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DCachedLUTTexture.cxx rename to VTKExtensions/private/Rendering/vtkF3DCachedLUTTexture.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DCachedLUTTexture.h b/VTKExtensions/private/Rendering/vtkF3DCachedLUTTexture.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DCachedLUTTexture.h rename to VTKExtensions/private/Rendering/vtkF3DCachedLUTTexture.h diff --git a/library/VTKExtensions/Rendering/vtkF3DCachedSpecularTexture.cxx b/VTKExtensions/private/Rendering/vtkF3DCachedSpecularTexture.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DCachedSpecularTexture.cxx rename to VTKExtensions/private/Rendering/vtkF3DCachedSpecularTexture.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DCachedSpecularTexture.h b/VTKExtensions/private/Rendering/vtkF3DCachedSpecularTexture.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DCachedSpecularTexture.h rename to VTKExtensions/private/Rendering/vtkF3DCachedSpecularTexture.h diff --git a/library/VTKExtensions/Rendering/vtkF3DDropZoneActor.cxx b/VTKExtensions/private/Rendering/vtkF3DDropZoneActor.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DDropZoneActor.cxx rename to VTKExtensions/private/Rendering/vtkF3DDropZoneActor.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DDropZoneActor.h b/VTKExtensions/private/Rendering/vtkF3DDropZoneActor.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DDropZoneActor.h rename to VTKExtensions/private/Rendering/vtkF3DDropZoneActor.h diff --git a/library/VTKExtensions/Rendering/vtkF3DHexagonalBokehBlurPass.cxx b/VTKExtensions/private/Rendering/vtkF3DHexagonalBokehBlurPass.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DHexagonalBokehBlurPass.cxx rename to VTKExtensions/private/Rendering/vtkF3DHexagonalBokehBlurPass.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DHexagonalBokehBlurPass.h b/VTKExtensions/private/Rendering/vtkF3DHexagonalBokehBlurPass.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DHexagonalBokehBlurPass.h rename to VTKExtensions/private/Rendering/vtkF3DHexagonalBokehBlurPass.h diff --git a/library/VTKExtensions/Rendering/vtkF3DInteractorEventRecorder.cxx b/VTKExtensions/private/Rendering/vtkF3DInteractorEventRecorder.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DInteractorEventRecorder.cxx rename to VTKExtensions/private/Rendering/vtkF3DInteractorEventRecorder.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DInteractorEventRecorder.h b/VTKExtensions/private/Rendering/vtkF3DInteractorEventRecorder.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DInteractorEventRecorder.h rename to VTKExtensions/private/Rendering/vtkF3DInteractorEventRecorder.h diff --git a/library/VTKExtensions/Rendering/vtkF3DInteractorStyle.cxx b/VTKExtensions/private/Rendering/vtkF3DInteractorStyle.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DInteractorStyle.cxx rename to VTKExtensions/private/Rendering/vtkF3DInteractorStyle.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DInteractorStyle.h b/VTKExtensions/private/Rendering/vtkF3DInteractorStyle.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DInteractorStyle.h rename to VTKExtensions/private/Rendering/vtkF3DInteractorStyle.h diff --git a/library/VTKExtensions/Rendering/vtkF3DNoRenderWindow.cxx b/VTKExtensions/private/Rendering/vtkF3DNoRenderWindow.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DNoRenderWindow.cxx rename to VTKExtensions/private/Rendering/vtkF3DNoRenderWindow.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DNoRenderWindow.h b/VTKExtensions/private/Rendering/vtkF3DNoRenderWindow.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DNoRenderWindow.h rename to VTKExtensions/private/Rendering/vtkF3DNoRenderWindow.h diff --git a/library/VTKExtensions/Rendering/vtkF3DOpenGLGridMapper.cxx b/VTKExtensions/private/Rendering/vtkF3DOpenGLGridMapper.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DOpenGLGridMapper.cxx rename to VTKExtensions/private/Rendering/vtkF3DOpenGLGridMapper.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DOpenGLGridMapper.h b/VTKExtensions/private/Rendering/vtkF3DOpenGLGridMapper.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DOpenGLGridMapper.h rename to VTKExtensions/private/Rendering/vtkF3DOpenGLGridMapper.h diff --git a/library/VTKExtensions/Rendering/vtkF3DOrientationMarkerWidget.cxx b/VTKExtensions/private/Rendering/vtkF3DOrientationMarkerWidget.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DOrientationMarkerWidget.cxx rename to VTKExtensions/private/Rendering/vtkF3DOrientationMarkerWidget.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DOrientationMarkerWidget.h b/VTKExtensions/private/Rendering/vtkF3DOrientationMarkerWidget.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DOrientationMarkerWidget.h rename to VTKExtensions/private/Rendering/vtkF3DOrientationMarkerWidget.h diff --git a/library/VTKExtensions/Rendering/vtkF3DPointSplatMapper.cxx b/VTKExtensions/private/Rendering/vtkF3DPointSplatMapper.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DPointSplatMapper.cxx rename to VTKExtensions/private/Rendering/vtkF3DPointSplatMapper.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DPointSplatMapper.h b/VTKExtensions/private/Rendering/vtkF3DPointSplatMapper.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DPointSplatMapper.h rename to VTKExtensions/private/Rendering/vtkF3DPointSplatMapper.h diff --git a/library/VTKExtensions/Rendering/vtkF3DPolyDataMapper.cxx b/VTKExtensions/private/Rendering/vtkF3DPolyDataMapper.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DPolyDataMapper.cxx rename to VTKExtensions/private/Rendering/vtkF3DPolyDataMapper.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DPolyDataMapper.h b/VTKExtensions/private/Rendering/vtkF3DPolyDataMapper.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DPolyDataMapper.h rename to VTKExtensions/private/Rendering/vtkF3DPolyDataMapper.h diff --git a/library/VTKExtensions/Rendering/vtkF3DRenderPass.cxx b/VTKExtensions/private/Rendering/vtkF3DRenderPass.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DRenderPass.cxx rename to VTKExtensions/private/Rendering/vtkF3DRenderPass.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DRenderPass.h b/VTKExtensions/private/Rendering/vtkF3DRenderPass.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DRenderPass.h rename to VTKExtensions/private/Rendering/vtkF3DRenderPass.h diff --git a/library/VTKExtensions/Rendering/vtkF3DRenderer.cxx b/VTKExtensions/private/Rendering/vtkF3DRenderer.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DRenderer.cxx rename to VTKExtensions/private/Rendering/vtkF3DRenderer.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DRenderer.h b/VTKExtensions/private/Rendering/vtkF3DRenderer.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DRenderer.h rename to VTKExtensions/private/Rendering/vtkF3DRenderer.h diff --git a/library/VTKExtensions/Rendering/vtkF3DRendererWithColoring.cxx b/VTKExtensions/private/Rendering/vtkF3DRendererWithColoring.cxx similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DRendererWithColoring.cxx rename to VTKExtensions/private/Rendering/vtkF3DRendererWithColoring.cxx diff --git a/library/VTKExtensions/Rendering/vtkF3DRendererWithColoring.h b/VTKExtensions/private/Rendering/vtkF3DRendererWithColoring.h similarity index 100% rename from library/VTKExtensions/Rendering/vtkF3DRendererWithColoring.h rename to VTKExtensions/private/Rendering/vtkF3DRendererWithColoring.h diff --git a/VTKShared/CMakeLists.txt b/VTKExtensions/public/CMakeLists.txt similarity index 60% rename from VTKShared/CMakeLists.txt rename to VTKExtensions/public/CMakeLists.txt index d64d3c9c15..067d83ab3d 100644 --- a/VTKShared/CMakeLists.txt +++ b/VTKExtensions/public/CMakeLists.txt @@ -1,5 +1,7 @@ vtk_module_find_modules(vtk_module_files "${CMAKE_CURRENT_SOURCE_DIR}") +# Although we have a single module +# we need to follow the full VTK module logic here vtk_module_scan( MODULE_FILES ${vtk_module_files} PROVIDES_MODULES modules @@ -11,22 +13,23 @@ vtk_module_scan( vtk_module_build( MODULES ${modules} INSTALL_EXPORT "f3dTargets" - INSTALL_HEADERS OFF - HEADERS_COMPONENT vtkext + INSTALL_HEADERS ON + HEADERS_COMPONENT plugin_sdk + HEADERS_EXCLUDE_FROM_ALL ON TARGETS_COMPONENT vtkext - PACKAGE "f3d-VTKShared") + PACKAGE "f3d-VTKExtensions-public") # We need non empty cmake vars for these calls for VTK <= 9.1 # See https://gitlab.kitware.com/vtk/vtk/-/merge_requests/9084 foreach (module IN LISTS modules) - if(NOT "${libf3d_compile_options_public}" STREQUAL "") - vtk_module_compile_options(${module} PUBLIC ${libf3d_compile_options_public}) + if(NOT "${f3d_compile_options_public}" STREQUAL "") + vtk_module_compile_options(${module} PUBLIC ${f3d_compile_options_public}) endif() - if(NOT "${libf3d_compile_options_private}" STREQUAL "") - vtk_module_compile_options(${module} PRIVATE ${libf3d_compile_options_private}) + if(NOT "${f3d_compile_options_private}" STREQUAL "") + vtk_module_compile_options(${module} PRIVATE ${f3d_compile_options_private}) endif() - if (NOT "${libf3d_link_options_public}" STREQUAL "") - vtk_module_link_options(${module} PUBLIC ${libf3d_link_options_public}) + if (NOT "${f3d_link_options_public}" STREQUAL "") + vtk_module_link_options(${module} PUBLIC ${f3d_link_options_public}) endif() vtk_module_set_property(${module} PROPERTY CXX_STANDARD VALUE 17) if(F3D_STRICT_BUILD AND MSVC) diff --git a/VTKShared/module/CMakeLists.txt b/VTKExtensions/public/module/CMakeLists.txt similarity index 61% rename from VTKShared/module/CMakeLists.txt rename to VTKExtensions/public/module/CMakeLists.txt index 1e58eba545..fcc4e9e29c 100644 --- a/VTKShared/module/CMakeLists.txt +++ b/VTKExtensions/public/module/CMakeLists.txt @@ -2,5 +2,5 @@ set(classes vtkF3DFaceVaryingPointDispatcher ) -vtk_module_add_module(f3d::VTKShared +vtk_module_add_module(f3d::VTKExtensionsPublic CLASSES ${classes}) diff --git a/VTKShared/module/Testing/CMakeLists.txt b/VTKExtensions/public/module/Testing/CMakeLists.txt similarity index 100% rename from VTKShared/module/Testing/CMakeLists.txt rename to VTKExtensions/public/module/Testing/CMakeLists.txt diff --git a/VTKShared/module/vtk.module b/VTKExtensions/public/module/vtk.module similarity index 55% rename from VTKShared/module/vtk.module rename to VTKExtensions/public/module/vtk.module index 548ccc4423..251009081b 100644 --- a/VTKShared/module/vtk.module +++ b/VTKExtensions/public/module/vtk.module @@ -1,7 +1,7 @@ NAME - f3d::VTKShared + f3d::VTKExtensionsPublic DESCRIPTION - A VTK module that is shared and usable by plugins + A VTK module that is shared and usable by both libf3d and plugins DEPENDS VTK::CommonExecutionModel PRIVATE_DEPENDS diff --git a/VTKShared/module/vtkF3DFaceVaryingPointDispatcher.cxx b/VTKExtensions/public/module/vtkF3DFaceVaryingPointDispatcher.cxx similarity index 100% rename from VTKShared/module/vtkF3DFaceVaryingPointDispatcher.cxx rename to VTKExtensions/public/module/vtkF3DFaceVaryingPointDispatcher.cxx diff --git a/VTKShared/module/vtkF3DFaceVaryingPointDispatcher.h b/VTKExtensions/public/module/vtkF3DFaceVaryingPointDispatcher.h similarity index 91% rename from VTKShared/module/vtkF3DFaceVaryingPointDispatcher.h rename to VTKExtensions/public/module/vtkF3DFaceVaryingPointDispatcher.h index 6ca56286dd..c471177c85 100644 --- a/VTKShared/module/vtkF3DFaceVaryingPointDispatcher.h +++ b/VTKExtensions/public/module/vtkF3DFaceVaryingPointDispatcher.h @@ -16,9 +16,9 @@ #define vtkF3DFaceVaryingPointDispatcher_h #include "vtkPolyDataAlgorithm.h" -#include "VTKSharedModule.h" +#include "VTKExtensionsPublicModule.h" -class VTKSHARED_EXPORT vtkF3DFaceVaryingPointDispatcher : public vtkPolyDataAlgorithm +class VTKEXTENSIONSPUBLIC_EXPORT vtkF3DFaceVaryingPointDispatcher : public vtkPolyDataAlgorithm { public: static vtkF3DFaceVaryingPointDispatcher* New(); diff --git a/cmake/f3dPlugin.cmake b/cmake/f3dPlugin.cmake index 570023cf00..5b7ab62f04 100644 --- a/cmake/f3dPlugin.cmake +++ b/cmake/f3dPlugin.cmake @@ -249,11 +249,14 @@ macro(f3d_plugin_build) EXPORT_FILE_NAME plugin_export.h EXPORT_MACRO_NAME F3D_PLUGIN_EXPORT) - if(UNIX) + # Add rpath origin so the VTKExtensionsShared can be found + if (APPLE) + set_target_properties(f3d PROPERTIES INSTALL_RPATH @loader_path) + elseif (UNIX) # On Unix, add the RPATH to VTK install folder get_target_property(target_type VTK::CommonCore TYPE) if (target_type STREQUAL SHARED_LIBRARY) - list(APPEND F3D_PLUGIN_ADDITIONAL_RPATHS "$") + list(APPEND F3D_PLUGIN_ADDITIONAL_RPATHS "$ORIGIN:$") endif () set_target_properties(f3d-plugin-${F3D_PLUGIN_NAME} PROPERTIES INSTALL_RPATH "${F3D_PLUGIN_ADDITIONAL_RPATHS}") @@ -289,7 +292,7 @@ macro(f3d_plugin_build) list(TRANSFORM F3D_PLUGIN_VTK_MODULES PREPEND "VTK::") target_link_libraries(f3d-plugin-${F3D_PLUGIN_NAME} PRIVATE - VTK::CommonCore VTK::CommonExecutionModel VTK::IOImport f3d::VTKShared + VTK::CommonCore VTK::CommonExecutionModel VTK::IOImport f3d::VTKExtensionsPublic ${F3D_PLUGIN_VTK_MODULES} ${modules}) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 95fa4e196e..a1d8b855fb 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -9,7 +9,7 @@ set(F3D_VTK_MODULES f3d::VTKExtensionsCore f3d::VTKExtensionsReaders f3d::VTKExtensionsRendering - f3d::VTKShared + f3d::VTKExtensionsPublic ) # Check modules @@ -31,23 +31,6 @@ if(F3D_MODULE_EXTERNAL_RENDERING) endif() endif() -set(libf3d_compile_options_private "") -set(libf3d_compile_options_public "") -set(libf3d_link_options_public "") - -# F3D_STRICT_BUILD -list(APPEND libf3d_compile_options_private ${f3d_strict_build_compile_options}) - -# Coverage -list(APPEND libf3d_compile_options_public ${f3d_coverage_compile_options}) -list(APPEND libf3d_link_options_public ${f3d_coverage_link_options}) - -# Sanitizer -list(APPEND libf3d_compile_options_public ${f3d_sanitizer_compile_options}) -list(APPEND libf3d_link_options_public ${f3d_sanitizer_link_options}) - -add_subdirectory(VTKExtensions) - configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/src/config.cxx.in" "${CMAKE_CURRENT_BINARY_DIR}/src/config.cxx" @@ -174,8 +157,8 @@ configure_file( list(TRANSFORM F3D_STATIC_PLUGIN_TARGETS PREPEND "f3d-plugin-") target_link_libraries(libf3d PRIVATE ${F3D_VTK_MODULES} ${F3D_STATIC_PLUGIN_TARGETS}) -target_compile_options(libf3d PUBLIC ${libf3d_compile_options_public} PRIVATE ${libf3d_compile_options_private}) -target_link_options(libf3d PUBLIC ${libf3d_link_options_public}) +target_compile_options(libf3d PUBLIC ${f3d_compile_options_public} PRIVATE ${f3d_compile_options_private}) +target_link_options(libf3d PUBLIC ${f3d_link_options_public}) if(F3D_STRICT_BUILD AND MSVC) # There are warnings in VTK related to deprecated features in C++17 @@ -252,6 +235,13 @@ if(BUILD_SHARED_LIBS) "${CMAKE_BINARY_DIR}/cmake/f3dConfig.cmake" "${CMAKE_BINARY_DIR}/cmake/f3dConfigVersion.cmake" "${F3D_SOURCE_DIR}/cmake/f3dEmbed.cmake" + DESTINATION + "${CMAKE_INSTALL_LIBDIR}/cmake/f3d" + COMPONENT sdk + EXCLUDE_FROM_ALL) + + install( + FILES "${F3D_SOURCE_DIR}/cmake/f3dPlugin.cmake" "${F3D_SOURCE_DIR}/cmake/plugin.cxx.in" "${F3D_SOURCE_DIR}/cmake/plugin.desktop.in" @@ -259,6 +249,7 @@ if(BUILD_SHARED_LIBS) "${F3D_SOURCE_DIR}/cmake/readerBoilerPlate.h.in" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/f3d" - COMPONENT sdk + COMPONENT plugin_sdk EXCLUDE_FROM_ALL) + endif() diff --git a/library/VTKExtensions/Core/Testing/TestF3DLog.cxx b/library/VTKExtensions/Core/Testing/TestF3DLog.cxx deleted file mode 100644 index d8e654c1df..0000000000 --- a/library/VTKExtensions/Core/Testing/TestF3DLog.cxx +++ /dev/null @@ -1,47 +0,0 @@ -#include "F3DLog.h" - -int TestF3DLog(int argc, char* argv[]) -{ - F3DLog::SetUseColoring(false); - F3DLog::Print(F3DLog::Severity::Debug, "Test Debug "); - F3DLog::Print(F3DLog::Severity::Info, "Test Info "); - F3DLog::Print(F3DLog::Severity::Warning, "Test Warning "); - F3DLog::Print(F3DLog::Severity::Error, "Test Error\n"); - - F3DLog::VerboseLevel = F3DLog::Severity::Debug; - F3DLog::Print(F3DLog::Severity::Debug, "Test Debug "); - F3DLog::Print(F3DLog::Severity::Info, "Test Info "); - F3DLog::Print(F3DLog::Severity::Warning, "Test Warning "); - F3DLog::Print(F3DLog::Severity::Error, "Test Error\n"); - - F3DLog::VerboseLevel = F3DLog::Severity::Warning; - F3DLog::Print(F3DLog::Severity::Debug, "Test Debug "); - F3DLog::Print(F3DLog::Severity::Info, "Test Info "); - F3DLog::Print(F3DLog::Severity::Warning, "Test Warning "); - F3DLog::Print(F3DLog::Severity::Error, "Test Error\n"); - - F3DLog::VerboseLevel = F3DLog::Severity::Error; - F3DLog::Print(F3DLog::Severity::Debug, "Test Debug "); - F3DLog::Print(F3DLog::Severity::Info, "Test Info "); - F3DLog::Print(F3DLog::Severity::Warning, "Test Warning "); - F3DLog::Print(F3DLog::Severity::Error, "Test Error\n"); - - F3DLog::VerboseLevel = F3DLog::Severity::Info; - F3DLog::SetQuiet(true); // Next print calls should print nothing - F3DLog::Print(F3DLog::Severity::Debug, "Test Debug Quiet "); - F3DLog::Print(F3DLog::Severity::Info, "Test Info Quiet "); - F3DLog::Print(F3DLog::Severity::Warning, "Test Warning Quiet "); - F3DLog::Print(F3DLog::Severity::Error, "Test Error Quiet\n"); - F3DLog::SetQuiet(false); - - // Without the object factory created, this is expected to have no effect - F3DLog::SetUseColoring(true); - - F3DLog::Print(F3DLog::Severity::Debug, "Test Debug Coloring "); - F3DLog::Print(F3DLog::Severity::Info, "Test Info Coloring "); - F3DLog::Print(F3DLog::Severity::Warning, "Test Warning Coloring "); - F3DLog::Print(F3DLog::Severity::Error, "Test Error Coloring\n"); - - F3DLog::WaitForUser(); // Without the object factory created, this is expected to have no effect - return EXIT_SUCCESS; -} diff --git a/library/src/engine.cxx b/library/src/engine.cxx index c86be3c8dc..c28602e190 100644 --- a/library/src/engine.cxx +++ b/library/src/engine.cxx @@ -194,6 +194,10 @@ void engine::loadPlugin(const std::string& pathOrName, const std::vector