[Jderobot-admin] jderobot-r1104 - trunk/src/testing/components/teleoperator

[lr.morales en jderobot.org]

Author: lr.morales
Date: 2013-11-12 01:36:20 +0100 (Tue, 12 Nov 2013)
New Revision: 1104

Modified:
   trunk/src/testing/components/teleoperator/CMakeLists.txt
   trunk/src/testing/components/teleoperator/Gui.h
   trunk/src/testing/components/teleoperator/SharedMemory.h
   trunk/src/testing/components/teleoperator/controlICE.h
Log:
#116 Updates jderobot libraries location according to current version. Fixes CMake according to current jderobot


Modified: trunk/src/testing/components/teleoperator/CMakeLists.txt
===================================================================
--- trunk/src/testing/components/teleoperator/CMakeLists.txt	2013-11-12 00:25:39 UTC (rev 1103)
+++ trunk/src/testing/components/teleoperator/CMakeLists.txt	2013-11-12 00:36:20 UTC (rev 1104)
@@ -13,14 +13,15 @@
 
 TARGET_LINK_LIBRARIES(teleoperatorPC 
     ${INTERFACES_CPP_DIR}/jderobot/libJderobotInterfaces.so
-    ${LIBS_DIR}/jderobotice/libjderobotice.so
     ${LIBS_DIR}/jderobotutil/libjderobotutil.so
-    ${LIBS_DIR}/colorspaces/libcolorspacesmm.so
+    ${LIBS_DIR}/visionlib/colorspaces/libcolorspacesmm.so
     ${OpenCV_LIBRARIES}        
+    ${OpenCVGUI_LIBRARIES}
 	${ZeroCIce_LIBRARIES}    
 	${gtkmm_LIBRARIES}  
 	${gtkmm3_LIBRARIES}  	
 	${gthread_LIBRARIES}
 	${Gearbox_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
 )
 

Modified: trunk/src/testing/components/teleoperator/Gui.h
===================================================================
--- trunk/src/testing/components/teleoperator/Gui.h	2013-11-12 00:25:39 UTC (rev 1103)
+++ trunk/src/testing/components/teleoperator/Gui.h	2013-11-12 00:36:20 UTC (rev 1104)
@@ -23,10 +23,10 @@
 #ifndef GUI_H
 #define	GUI_H
 
-#include <colorspaces/colorspacesmm.h>
-#include<gtk-2.0/gtk/gtk.h>
+#include <visionlib/colorspaces/colorspacesmm.h>
+#include <gtk-2.0/gtk/gtk.h>
 //#include<gtk-2.0/gdk/gdk.h>
-#include<gtkmm-2.4/gtkmm.h>
+#include <gtkmm-2.4/gtkmm.h>
 #include <gtkmm/drawingarea.h>
 //#include <gdkmm/pixbuf.h>
 //#include <gdkmm-3.0/gdkmm/pixbuf.h>

Modified: trunk/src/testing/components/teleoperator/SharedMemory.h
===================================================================
--- trunk/src/testing/components/teleoperator/SharedMemory.h	2013-11-12 00:25:39 UTC (rev 1103)
+++ trunk/src/testing/components/teleoperator/SharedMemory.h	2013-11-12 00:36:20 UTC (rev 1104)
@@ -31,7 +31,7 @@
 #include <jderobot/camera.h>
 #include <jderobot/pose3dmotors.h>
 #include <jderobot/pose3dencoders.h>
-#include <colorspaces/colorspacesmm.h>
+#include <visionlib/colorspaces/colorspacesmm.h>
 #include "Gui.h"
 
 #ifndef SHAREDMEMORY_H

Modified: trunk/src/testing/components/teleoperator/controlICE.h
===================================================================
--- trunk/src/testing/components/teleoperator/controlICE.h	2013-11-12 00:25:39 UTC (rev 1103)
+++ trunk/src/testing/components/teleoperator/controlICE.h	2013-11-12 00:36:20 UTC (rev 1104)
@@ -34,7 +34,7 @@
 #include <jderobot/camera.h>
 #include <jderobot/pose3dmotors.h>
 #include <jderobot/pose3dencoders.h>
-#include <colorspaces/colorspacesmm.h>
+#include <visionlib/colorspaces/colorspacesmm.h>
 #include "SharedMemory.h"
 
 class controlICE {