From e6bcd496466a57cac98d1a2c2d71784dbf3c8870 Mon Sep 17 00:00:00 2001
From: Timo Lotterbach <timo.lotterbach@bmw-carit.de>
Date: Fri, 8 Mar 2013 05:28:14 -0800
Subject: [PATCH] LayerManagerControl: updated according to ilmClient split

Signed-off-by: Timo Lotterbach <timo.lotterbach@bmw-carit.de>
---
 CMakeLists.txt                       | 1 +
 LayerManagerControl/CMakeLists.txt   | 4 +++-
 LayerManagerControl/src/commands.cpp | 1 +
 LayerManagerControl/src/common.cpp   | 1 +
 LayerManagerControl/src/control.cpp  | 1 +
 LayerManagerControl/src/demo.cpp     | 1 +
 LayerManagerControl/src/print.cpp    | 1 +
 LayerManagerControl/src/scatter.cpp  | 1 +
 LayerManagerControl/src/sceneio.cpp  | 1 +
 9 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f19cec..3360742 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,6 +94,7 @@ build_flag (WITH_CONTROL_BIN "Build LayerManagerControl binary" ON)
 if (WITH_CONTROL_BIN)
     add_subdirectory_once (LayerManagerUtils)
     add_subdirectory_once (LayerManagerClient/ilmClient)
+    add_subdirectory_once (LayerManagerClient/ilmControl)
     add_subdirectory_once (LayerManagerControl)
 endif(WITH_CONTROL_BIN)
 
diff --git a/LayerManagerControl/CMakeLists.txt b/LayerManagerControl/CMakeLists.txt
index d47ee60..e756f7b 100644
--- a/LayerManagerControl/CMakeLists.txt
+++ b/LayerManagerControl/CMakeLists.txt
@@ -23,6 +23,7 @@ project_type(CORE)
 include_directories(
     include
     "${CMAKE_SOURCE_DIR}/LayerManagerClient/ilmClient/include"
+    "${CMAKE_SOURCE_DIR}/LayerManagerClient/ilmControl/include"
     "${CMAKE_SOURCE_DIR}/LayerManagerUtils/include"
 )
 
@@ -43,9 +44,10 @@ add_executable(${PROJECT_NAME}
 
 add_dependencies(${PROJECT_NAME}
     ilmClient
+    ilmControl
     LayerManagerUtils
 )
 
-target_link_libraries(${PROJECT_NAME} ilmClient)
+target_link_libraries(${PROJECT_NAME} ilmClient ilmControl)
 
 install (TARGETS ${PROJECT_NAME} DESTINATION bin)
diff --git a/LayerManagerControl/src/commands.cpp b/LayerManagerControl/src/commands.cpp
index c57802e..b0c4dfd 100644
--- a/LayerManagerControl/src/commands.cpp
+++ b/LayerManagerControl/src/commands.cpp
@@ -17,6 +17,7 @@
  *
  ****************************************************************************/
 #include "ilm_client.h"
+#include "ilm_control.h"
 #include "LMControl.h"
 #include "Expression.h"
 #include "ExpressionInterpreter.h"
diff --git a/LayerManagerControl/src/common.cpp b/LayerManagerControl/src/common.cpp
index 5e42e03..65b1ee0 100644
--- a/LayerManagerControl/src/common.cpp
+++ b/LayerManagerControl/src/common.cpp
@@ -18,6 +18,7 @@
  ****************************************************************************/
 
 #include "ilm_client.h"
+#include "ilm_control.h"
 #include "LMControl.h"
 
 #include <algorithm>
diff --git a/LayerManagerControl/src/control.cpp b/LayerManagerControl/src/control.cpp
index 549b761..94bf3df 100644
--- a/LayerManagerControl/src/control.cpp
+++ b/LayerManagerControl/src/control.cpp
@@ -18,6 +18,7 @@
  ****************************************************************************/
 
 #include "ilm_client.h"
+#include "ilm_control.h"
 #include "LMControl.h"
 
 #include <cstring>
diff --git a/LayerManagerControl/src/demo.cpp b/LayerManagerControl/src/demo.cpp
index dcd2184..4a17fd0 100644
--- a/LayerManagerControl/src/demo.cpp
+++ b/LayerManagerControl/src/demo.cpp
@@ -18,6 +18,7 @@
  ****************************************************************************/
 
 #include "ilm_client.h"
+#include "ilm_control.h"
 #include "LMControl.h"
 
 #include <cmath>
diff --git a/LayerManagerControl/src/print.cpp b/LayerManagerControl/src/print.cpp
index 05ee7e4..a4d079b 100644
--- a/LayerManagerControl/src/print.cpp
+++ b/LayerManagerControl/src/print.cpp
@@ -18,6 +18,7 @@
  ****************************************************************************/
 
 #include "ilm_client.h"
+#include "ilm_control.h"
 #include "LMControl.h"
 
 #include <iostream>
diff --git a/LayerManagerControl/src/scatter.cpp b/LayerManagerControl/src/scatter.cpp
index 22e70f8..0cb27b9 100644
--- a/LayerManagerControl/src/scatter.cpp
+++ b/LayerManagerControl/src/scatter.cpp
@@ -18,6 +18,7 @@
  ****************************************************************************/
 
 #include "ilm_client.h"
+#include "ilm_control.h"
 #include "LMControl.h"
 
 #include <cmath>
diff --git a/LayerManagerControl/src/sceneio.cpp b/LayerManagerControl/src/sceneio.cpp
index 470e6c3..6f29081 100644
--- a/LayerManagerControl/src/sceneio.cpp
+++ b/LayerManagerControl/src/sceneio.cpp
@@ -17,6 +17,7 @@
  *
  ****************************************************************************/
 #include "ilm_client.h"
+#include "ilm_control.h"
 #include "LMControl.h"
 #include "Expression.h"
 #include "ExpressionInterpreter.h"
-- 
2.7.4