[Jderobot-admin] jderobot-r1116 - in trunk/src: stable/components stable/components/teleoperator testing/components

[lr.morales en jderobot.org]

Author: lr.morales
Date: 2013-11-27 16:28:28 +0100 (Wed, 27 Nov 2013)
New Revision: 1116

Added:
   trunk/src/stable/components/teleoperator/
Removed:
   trunk/src/testing/components/teleoperator/
Modified:
   trunk/src/stable/components/teleoperator/CMakeLists.txt
Log:
#116 Moves teleoperator to the stable branch.



Modified: trunk/src/stable/components/teleoperator/CMakeLists.txt
===================================================================
--- trunk/src/testing/components/teleoperator/CMakeLists.txt	2013-11-24 23:23:40 UTC (rev 1115)
+++ trunk/src/stable/components/teleoperator/CMakeLists.txt	2013-11-27 15:28:28 UTC (rev 1116)
@@ -4,6 +4,7 @@
 include_directories(
     ${INTERFACES_CPP_DIR}
     ${LIBS_DIR}
+    ${gtkmm_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
@@ -19,7 +20,7 @@
     ${OpenCVGUI_LIBRARIES}
     ${ZeroCIce_LIBRARIES}    
     ${gtkmm_LIBRARIES}  
-    ${gtkmm3_LIBRARIES}     
+    #${gtkmm3_LIBRARIES}     
     ${gthread_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
 )