ENH: Separate SceneElement target from Scene

To fix dependencies ambiguities with Collision

ENH: Separate SceneElement target from Scene
ccedf47f · Alexis Girault · f21c98b6 · ccedf47f · ccedf47f · ccedf47f
Commit ccedf47f authored 8 years ago by Alexis Girault
--- a/Base/Collision/CMakeLists.txt
+++ b/Base/Collision/CMakeLists.txt
@@ -4,7 +4,7 @@
 include(imstkAddLibrary)
 imstk_add_library( Collision
  DEPENDS
-    Scene
+    SceneElements
  )

 #-----------------------------------------------------------------------------

--- a/Base/Scene/CMakeLists.txt
+++ b/Base/Scene/CMakeLists.txt
@@ -5,8 +5,8 @@ include(imstkAddLibrary)
 imstk_add_library( Scene
  DEPENDS
    Core
-    Geometry
-    Devices
+    SceneElements
+    Collision
  )

 #-----------------------------------------------------------------------------

--- a/Base/SceneElements/CMakeLists.txt
+++ b/Base/SceneElements/CMakeLists.txt
+#-----------------------------------------------------------------------------
+# Create target
+#-----------------------------------------------------------------------------
+include(imstkAddLibrary)
+imstk_add_library( SceneElements
+  DEPENDS
+    Core
+    Geometry
+    Devices
+  )
+
+#-----------------------------------------------------------------------------
+# Testing
+#-----------------------------------------------------------------------------
+if( iMSTK_BUILD_TESTING )
+  add_subdirectory( Testing )
+endif()
--- a/Base/Scene/Camera/imstkCamera.cpp
+++ b/Base/Scene/Camera/imstkCamera.cpp
--- a/Base/Scene/Camera/imstkCamera.h
+++ b/Base/Scene/Camera/imstkCamera.h
--- a/Base/Scene/Controllers/imstkCameraController.cpp
+++ b/Base/Scene/Controllers/imstkCameraController.cpp
--- a/Base/Scene/Controllers/imstkCameraController.h
+++ b/Base/Scene/Controllers/imstkCameraController.h
--- a/Base/Scene/Controllers/imstkTrackingController.cpp
+++ b/Base/Scene/Controllers/imstkTrackingController.cpp
--- a/Base/Scene/Controllers/imstkTrackingController.h
+++ b/Base/Scene/Controllers/imstkTrackingController.h
--- a/Base/Scene/Light/imstkLight.cpp
+++ b/Base/Scene/Light/imstkLight.cpp
--- a/Base/Scene/Light/imstkLight.h
+++ b/Base/Scene/Light/imstkLight.h
--- a/Base/Scene/Object/imstkCollidingObject.cpp
+++ b/Base/Scene/Object/imstkCollidingObject.cpp
--- a/Base/Scene/Object/imstkCollidingObject.h
+++ b/Base/Scene/Object/imstkCollidingObject.h
--- a/Base/Scene/Object/imstkDeformableObject.cpp
+++ b/Base/Scene/Object/imstkDeformableObject.cpp
--- a/Base/Scene/Object/imstkDeformableObject.h
+++ b/Base/Scene/Object/imstkDeformableObject.h
--- a/Base/Scene/Object/imstkSceneObject.cpp
+++ b/Base/Scene/Object/imstkSceneObject.cpp
--- a/Base/Scene/Object/imstkSceneObject.h
+++ b/Base/Scene/Object/imstkSceneObject.h
--- a/Base/Scene/Object/imstkVirtualCouplingObject.cpp
+++ b/Base/Scene/Object/imstkVirtualCouplingObject.cpp
--- a/Base/Scene/Object/imstkVirtualCouplingObject.h
+++ b/Base/Scene/Object/imstkVirtualCouplingObject.h
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,8 +143,9 @@ include_directories( ${VRPN_INCLUDE_DIRS} )
 add_subdirectory(Base/Core)
 add_subdirectory(Base/Geometry)
 add_subdirectory(Base/Devices)
-add_subdirectory(Base/Scene)
+add_subdirectory(Base/SceneElements)
 add_subdirectory(Base/Collision)
+add_subdirectory(Base/Scene)
 add_subdirectory(Base/Rendering)
 add_subdirectory(Base/SimulationManager)