ArViz: Split client and Coin code into separate libraries

source/RobotAPI/components/ArViz/CMakeLists.txt

@@ -21,6 +21,53 @@ set(SOURCES
     Client/drawer/ArVizDrawerBase.cpp
     Client/ScopedClient.cpp
 
+)
+
+set(HEADERS
+
+    IceConversions.h
+
+    # Client
+    Client/Layer.h
+    Client/Elements.h
+    Client/Client.h
+    Client/ScopedClient.h
+    Client/ClientCGALExtensions.h
+    Client/Color.h
+
+    Client/elements/Color.h
+    Client/elements/ElementOps.h
+    Client/elements/Mesh.h
+    Client/elements/MeshCGALExtensions.h
+    Client/elements/PointCloud.h
+    Client/elements/Robot.h
+    Client/elements/RobotHand.h
+    Client/elements/Line.h
+    Client/elements/Path.h
+
+    Client/drawer/ArVizDrawerBase.h
+
+    Client/elements/point_cloud_type_traits.hpp
+)
+
+armarx_add_component("${SOURCES}" "${HEADERS}")
+
+add_library(RobotAPI::ArViz ALIAS ArViz)
+
+
+# ArViz Coin library
+
+armarx_component_set_name("ArVizCoin")
+
+set(COMPONENT_LIBS
+    ArmarXCore
+    RobotAPICore
+    RobotAPIInterfaces
+    RobotAPIArmarXObjects
+)
+
+set(SOURCES
+
     Coin/ElementVisualizer.cpp
 
     Coin/VisualizationRobot.cpp
@@ -43,8 +90,6 @@ set(SOURCES
 
 set(HEADERS
 
-    IceConversions.h
-
     Coin/ElementVisualizer.h
 
     # Inventor
@@ -69,28 +114,6 @@ set(HEADERS
     Coin/Visualizer.h
     Coin/ExportVRML.h
 
-    # Client
-    Client/Layer.h
-    Client/Elements.h
-    Client/Client.h
-    Client/ScopedClient.h
-    Client/ClientCGALExtensions.h
-    Client/Color.h
-
-    Client/elements/Color.h
-    Client/elements/ElementOps.h
-    Client/elements/Mesh.h
-    Client/elements/MeshCGALExtensions.h
-    Client/elements/PointCloud.h
-    Client/elements/Robot.h
-    Client/elements/RobotHand.h
-    Client/elements/Line.h
-    Client/elements/Path.h
-
-    Client/drawer/ArVizDrawerBase.h
-
-    Client/elements/point_cloud_type_traits.hpp
-
     Introspection/ElementJsonSerializers.h
     Introspection/exceptions.h
 
@@ -103,22 +126,22 @@ set(HEADERS
 
 armarx_add_component("${SOURCES}" "${HEADERS}")
 
-add_library(RobotAPI::ArViz ALIAS ArViz)
+add_library(RobotAPI::ArVizCoin ALIAS ArVizCoin)
 
 
 armarx_component_set_name("ArVizStorage")
 
 set(COMPONENT_LIBS
     ArmarXCore
-    ArViz
+    RobotAPIInterfaces
     )
 
 set(SOURCES
-ArVizStorage.cpp
-ArVizStorageMain.cpp
+    ArVizStorage.cpp
+    ArVizStorageMain.cpp
 )
 set(HEADERS
-ArVizStorage.h
+    ArVizStorage.h
 )
 
 armarx_add_component_executable("${SOURCES}" "${HEADERS}")

source/RobotAPI/gui-plugins/ArViz/CMakeLists.txt

@@ -28,7 +28,7 @@ set(GUI_UIS ArVizWidget.ui)
 
 # Add more libraries you depend on here, e.g. ${QT_LIBRARIES}.
 set(COMPONENT_LIBS
-    ArViz
+    RobotAPI::ArVizCoin
     SimpleConfigDialog
 )