Fixup vtkshared

f3d-app · Feb 13, 2024 · f6a8061 · f6a8061
1 parent 331ab80
commit f6a8061
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 3 deletions.
diff --git 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 → VTKShared/CMakeLists.txt b/library/VTKShared/CMakeLists.txt → VTKShared/CMakeLists.txt
diff --git a/library/VTKShared/module/CMakeLists.txt → VTKShared/module/CMakeLists.txt b/library/VTKShared/module/CMakeLists.txt → VTKShared/module/CMakeLists.txt
diff --git a/...y/VTKShared/module/Testing/CMakeLists.txt → VTKShared/module/Testing/CMakeLists.txt b/...y/VTKShared/module/Testing/CMakeLists.txt → VTKShared/module/Testing/CMakeLists.txt
diff --git a/...y/VTKShared/module/Testing/TestF3DLog.cxx → VTKShared/module/Testing/TestF3DLog.cxx b/...y/VTKShared/module/Testing/TestF3DLog.cxx → VTKShared/module/Testing/TestF3DLog.cxx
diff --git a/library/VTKShared/module/vtk.module → VTKShared/module/vtk.module b/library/VTKShared/module/vtk.module → VTKShared/module/vtk.module
diff --git a/...dule/vtkF3DFaceVaryingPointDispatcher.cxx → ...dule/vtkF3DFaceVaryingPointDispatcher.cxx b/...dule/vtkF3DFaceVaryingPointDispatcher.cxx → ...dule/vtkF3DFaceVaryingPointDispatcher.cxx
diff --git a/...module/vtkF3DFaceVaryingPointDispatcher.h → ...module/vtkF3DFaceVaryingPointDispatcher.h b/...module/vtkF3DFaceVaryingPointDispatcher.h → ...module/vtkF3DFaceVaryingPointDispatcher.h
diff --git 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(