From f6a80613f2dfccefe1d26c42db85e7598fbd5ded Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 13 Feb 2024 08:50:30 +0100 Subject: [PATCH] Fixup vtkshared --- CMakeLists.txt | 7 +++++-- {library/VTKShared => VTKShared}/CMakeLists.txt | 0 {library/VTKShared => VTKShared}/module/CMakeLists.txt | 0 .../VTKShared => VTKShared}/module/Testing/CMakeLists.txt | 0 .../VTKShared => VTKShared}/module/Testing/TestF3DLog.cxx | 0 {library/VTKShared => VTKShared}/module/vtk.module | 0 .../module/vtkF3DFaceVaryingPointDispatcher.cxx | 0 .../module/vtkF3DFaceVaryingPointDispatcher.h | 0 library/CMakeLists.txt | 1 - 9 files changed, 5 insertions(+), 3 deletions(-) rename {library/VTKShared => VTKShared}/CMakeLists.txt (100%) rename {library/VTKShared => VTKShared}/module/CMakeLists.txt (100%) rename {library/VTKShared => VTKShared}/module/Testing/CMakeLists.txt (100%) rename {library/VTKShared => VTKShared}/module/Testing/TestF3DLog.cxx (100%) rename {library/VTKShared => VTKShared}/module/vtk.module (100%) rename {library/VTKShared => VTKShared}/module/vtkF3DFaceVaryingPointDispatcher.cxx (100%) rename {library/VTKShared => VTKShared}/module/vtkF3DFaceVaryingPointDispatcher.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 415d8763c6..84383ffdaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,8 +189,8 @@ endif() # F3D Application cmake_dependent_option(F3D_BUILD_APPLICATION "Build the application" ON "NOT ANDROID AND NOT EMSCRIPTEN" OFF) -# libf3d target -add_subdirectory(library) +# VTKShared module +add_subdirectory(VTKShared) # plugins option(F3D_PLUGINS_STATIC_BUILD "Make all plugins static (embedded into libf3d) and automatically loaded by F3D" ON) @@ -202,6 +202,9 @@ set(F3D_PLUGINS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Plugins inst mark_as_advanced(F3D_PLUGINS_INSTALL_DIR) add_subdirectory(plugins) +# libf3d target +add_subdirectory(library) + if (F3D_BUILD_APPLICATION) add_subdirectory(application) endif() diff --git a/library/VTKShared/CMakeLists.txt b/VTKShared/CMakeLists.txt similarity index 100% rename from library/VTKShared/CMakeLists.txt rename to VTKShared/CMakeLists.txt diff --git a/library/VTKShared/module/CMakeLists.txt b/VTKShared/module/CMakeLists.txt similarity index 100% rename from library/VTKShared/module/CMakeLists.txt rename to VTKShared/module/CMakeLists.txt diff --git a/library/VTKShared/module/Testing/CMakeLists.txt b/VTKShared/module/Testing/CMakeLists.txt similarity index 100% rename from library/VTKShared/module/Testing/CMakeLists.txt rename to VTKShared/module/Testing/CMakeLists.txt diff --git a/library/VTKShared/module/Testing/TestF3DLog.cxx b/VTKShared/module/Testing/TestF3DLog.cxx similarity index 100% rename from library/VTKShared/module/Testing/TestF3DLog.cxx rename to VTKShared/module/Testing/TestF3DLog.cxx diff --git a/library/VTKShared/module/vtk.module b/VTKShared/module/vtk.module similarity index 100% rename from library/VTKShared/module/vtk.module rename to VTKShared/module/vtk.module diff --git a/library/VTKShared/module/vtkF3DFaceVaryingPointDispatcher.cxx b/VTKShared/module/vtkF3DFaceVaryingPointDispatcher.cxx similarity index 100% rename from library/VTKShared/module/vtkF3DFaceVaryingPointDispatcher.cxx rename to VTKShared/module/vtkF3DFaceVaryingPointDispatcher.cxx diff --git a/library/VTKShared/module/vtkF3DFaceVaryingPointDispatcher.h b/VTKShared/module/vtkF3DFaceVaryingPointDispatcher.h similarity index 100% rename from library/VTKShared/module/vtkF3DFaceVaryingPointDispatcher.h rename to VTKShared/module/vtkF3DFaceVaryingPointDispatcher.h diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 6049397718..84d6eb2627 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -46,7 +46,6 @@ list(APPEND libf3d_link_options_public ${f3d_coverage_link_options}) list(APPEND libf3d_compile_options_public ${f3d_sanitizer_compile_options}) list(APPEND libf3d_link_options_public ${f3d_sanitizer_link_options}) -add_subdirectory(VTKShared) add_subdirectory(VTKExtensions) configure_file(