REFAC: Move meshIO, geometryMappers out of geometry

CMakeLists.txt

@@ -366,6 +366,8 @@ set(${PROJECT_NAME}_INSTALL_FOLDER ${PROJECT_NAME}-${${PROJECT_NAME}_VERSION_MAJ
 #--------------------------------------------------------------------------
 add_subdirectory(Source/Common)
 add_subdirectory(Source/Geometry)
+add_subdirectory(Source/MeshIO)
+add_subdirectory(Source/GeometryMappers)
 add_subdirectory(Source/DataStructures)
 add_subdirectory(Source/Constraint)
 add_subdirectory(Source/Devices)

Source/Animation/CMakeLists.txt

@@ -6,6 +6,7 @@ imstk_add_library( Animation
   DEPENDS
     Common
     #Geometry
+    Materials
     SceneElements
   )
 

Source/Geometry/CMakeLists.txt

@@ -5,11 +5,7 @@ include(imstkAddLibrary)
 imstk_add_library( Geometry
   DEPENDS
     Common
-    glm
-    Assimp
-    Materials
-    VegaFEM::volumetricMesh
-    ${VTK_LIBRARIES}
+    tbb
   )
 
 #-----------------------------------------------------------------------------

Source/Geometry/Mesh/imstkVolumetricMesh.cpp

@@ -23,12 +23,6 @@
 #include "imstkSurfaceMesh.h"
 #include "imstkLogger.h"
 
-#pragma warning( push )
-#pragma warning( disable : 4458 )
-// Vega
-#include "volumetricMesh.h"
-#pragma warning( pop )
-
 namespace imstk
 {
 std::shared_ptr<SurfaceMesh>

Source/GeometryMappers/CMakeLists.txt

+#-----------------------------------------------------------------------------
+# Create target
+#-----------------------------------------------------------------------------
+include(imstkAddLibrary)
+imstk_add_library( GeometryMappers
+  DEPENDS
+	Geometry
+  )
+
+#-----------------------------------------------------------------------------
+# Testing
+#-----------------------------------------------------------------------------
+#if( ${PROJECT_NAME}_BUILD_TESTING )
+#  include(imstkAddTest)
+#  imstk_add_test( GeometryMappers )
+#endif()

Source/MeshIO/CMakeLists.txt

+#-----------------------------------------------------------------------------
+# Create target
+#-----------------------------------------------------------------------------
+include(imstkAddLibrary)
+imstk_add_library( MeshIO
+  DEPENDS
+    Common
+	Geometry
+    glm
+    Assimp    
+    VegaFEM::volumetricMesh
+    ${VTK_LIBRARIES}
+  )
+
+#-----------------------------------------------------------------------------
+# Testing
+#-----------------------------------------------------------------------------
+#if( ${PROJECT_NAME}_BUILD_TESTING )
+#  include(imstkAddTest)
+#  imstk_add_test( Geometry )
+#endif()