Lun Oct 7 12:21:53 CEST 2013

Author: frivas
Date: 2013-10-07 12:20:53 +0200 (Mon, 07 Oct 2013)
New Revision: 1008

Removed:
   trunk/Deps/gearbox/
   trunk/src/testing/libs/jderobotice/
Modified:
   trunk/CMakeLists.txt
   trunk/src/stable/components/basic_component/build/CMakeLists.txt
   trunk/src/stable/components/cameraserver/build-independent/CMakeLists.txt
   trunk/src/stable/components/cameraserver/build/CMakeLists.txt
   trunk/src/stable/components/gazeboserver/build/CMakeLists.txt
   trunk/src/stable/components/gazeboserver/pluginsGazebo/kinect/build/CMakeLists.txt
   trunk/src/stable/components/introrob/build/CMakeLists.txt
   trunk/src/stable/components/kinectViewer/build/CMakeLists.txt
   trunk/src/stable/components/opencvdemo/build/CMakeLists.txt
   trunk/src/stable/components/openniServer/build-independent/CMakeLists.txt
   trunk/src/stable/components/openniServer/build/CMakeLists.txt
   trunk/src/stable/components/replayController/build/CMakeLists.txt
   trunk/src/stable/components/replayer/build/CMakeLists.txt
   trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt
   trunk/src/stable/components/rgbdManualCalibrator/build/CMakeLists.txt
   trunk/src/testing/components/calibrator/build/CMakeLists.txt
   trunk/src/testing/components/teleoperator/build/CMakeLists.txt
Log:
#42 Deleted gearbox Deps and jderobotice lib from trunk 


Modified: trunk/CMakeLists.txt
===================================================================

--- trunk/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -5,20 +5,11 @@
 # ENV VARS
 SET(gladedir ./)
 SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Deps) # Directorio donde se encuentran las dependencias
-
-#comprobamos si tenemos gearbox y si no desactivamos todos los componentes que dependan de él
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
-
-
 SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/cpp) # Directorio con las interfaces ICE en C++
 SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/libs) # Directorio donde se encuentran las librerias propias de jderobot
 SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/slice) # Directorio donde se encuentran las interfaces ICE
 SET( LIBS_NEEDED  colorspaces jderobotutil progeo pioneer fuzzylib visionlib parallelIce ) # Librerias de las que depende el componente
 
-IF( Gearbox_INCLUDE_DIR ) 
-	#librerías que dependen de gearbox
-	SET( LIBS_NEEDED   ${LIBS_NEEDED} bgfgsegmentation jderobotice )
-ENDIF()
 
 
 # MACRO to get the list of subdirectories
@@ -40,14 +31,8 @@
 endmacro()
 
 
-#TODO: Fix the dependencies of GearBox
-IF( Gearbox_INCLUDE_DIR ) 
-	#librerías que dependen de gearbox
-	SET( COMPONENTS  ${COMPONENTS}  bgfglab replayer wiimoteServer)
-ENDIF()
 
 
-
 ###################
 #                 #
 #  CHECK SYSTEM   #

Modified: trunk/src/stable/components/basic_component/build/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/basic_component/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/basic_component/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -8,7 +8,7 @@
 SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/cpp) # Directorio con las interfaces ICE en C++
 SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs) # Directorio donde se encuentran las librerias propias de jderobot
 SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/slice) # Directorio donde se encuentran las interfaces ICE
-SET( LIBS_NEEDED   jderobotice jderobotutil colorspaces ) # Librerias de las que depende el componente
+SET( LIBS_NEEDED   jderobotutil colorspaces ) # Librerias de las que depende el componente
 SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Deps) # Directorio donde se encuentran las dependencias
 
 
@@ -35,7 +35,6 @@
 link_directories(${libglademm_LIBRARY_DIRS})
 
   # FIND AND CHECK OTHER DEPENDENCES
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 include(${DEPS_DIR}/ice/CMakeLists.txt)
 include(${DEPS_DIR}/opencv/CMakeLists.txt)
 include(${DEPS_DIR}/pthread/CMakeLists.txt)

Modified: trunk/src/stable/components/cameraserver/build/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/cameraserver/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/cameraserver/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -21,7 +21,6 @@
 
 
   # FIND AND CHECK OTHER DEPENDENCES
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 include(${DEPS_DIR}/ice/CMakeLists.txt)
 include(${DEPS_DIR}/opencv/CMakeLists.txt)
 include(${DEPS_DIR}/pthread/CMakeLists.txt)

Modified: trunk/src/stable/components/cameraserver/build-independent/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/cameraserver/build-independent/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/cameraserver/build-independent/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -5,7 +5,6 @@
 
 include_directories(
 	/usr/local/include/jderobot
-	/usr/local/include/gearbox
 )
 SET( CMAKE_CXX_FLAGS "-lIce -lIceUtil" ) # Opciones para el compilador
 
@@ -20,7 +19,6 @@
     ${INTERFACES_CPP_DIR}/jderobot/libjderobotutil.so
 	${INTERFACES_CPP_DIR}/jderobot/libcolorspacesmm.so
 	${OpenCV_LIBS}
-	/usr/local/lib/gearbox/libGbxIceUtilAcfr.so
 
 )
 	

Modified: trunk/src/stable/components/gazeboserver/build/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/gazeboserver/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/gazeboserver/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -48,7 +48,6 @@
 #include_directories(${gtkglextmm_INCLUDE_DIRS})
 #link_directories(${gtkglextmm_LIBRARY_DIRS})
 
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 include(${DEPS_DIR}/ice/CMakeLists.txt)
 include(${DEPS_DIR}/opencv/CMakeLists.txt)
 

Modified: trunk/src/stable/components/gazeboserver/pluginsGazebo/kinect/build/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/gazeboserver/pluginsGazebo/kinect/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/gazeboserver/pluginsGazebo/kinect/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -20,7 +20,6 @@
 include(${DEPS_DIR}/ice/CMakeLists.txt)
 #include(${DEPS_DIR}/pcl/CMakeLists.txt)
 include(${DEPS_DIR}/opencv/CMakeLists.txt)
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 
 add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/../../../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
 add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..)

Modified: trunk/src/stable/components/introrob/build/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/introrob/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/introrob/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -60,7 +60,6 @@
 
 
   # FIND AND CHECK OTHER DEPENDENCES
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 include(${DEPS_DIR}/ice/CMakeLists.txt)
 include(${DEPS_DIR}/opencv/CMakeLists.txt)
 include(${DEPS_DIR}/pthread/CMakeLists.txt)

Modified: trunk/src/stable/components/kinectViewer/build/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/kinectViewer/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/kinectViewer/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -8,7 +8,7 @@
 SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/cpp) # Directorio con las interfaces ICE en C++
 SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs) # Directorio donde se encuentran las librerias propias de jderobot
 SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/slice) # Directorio donde se encuentran las interfaces ICE
-SET( LIBS_NEEDED   bgfgsegmentation jderobotice colorspaces jderobotutil progeo pioneer fuzzylib visionlib parallelIce ) # Librerias de las que depende el componente
+SET( LIBS_NEEDED colorspaces jderobotutil progeo pioneer fuzzylib visionlib parallelIce ) # Librerias de las que depende el componente
 SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Deps) # Directorio donde se encuentran las dependencias
 
 ###################
@@ -62,7 +62,6 @@
 link_directories(${gsl_LIBRARIES_DIRS})
 
 # FIND AND CHECK OTHER DEPENDENCES
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 #include(${DEPS_DIR}/fireware/CMakeLists.txt)
 #include(${DEPS_DIR}/pcl/CMakeLists.txt)
 #include(${DEPS_DIR}/xerces/CMakeLists.txt)

Modified: trunk/src/stable/components/opencvdemo/build/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/opencvdemo/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/opencvdemo/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -8,7 +8,7 @@
 SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/cpp) # Directorio con las interfaces ICE en C++
 SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs) # Directorio donde se encuentran las librerias propias de jderobot
 SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/slice) # Directorio donde se encuentran las interfaces ICE
-SET( LIBS_NEEDED   bgfgsegmentation jderobotice colorspaces jderobotutil progeo fuzzylib visionlib ) # Librerias de las que depende el componente
+SET( LIBS_NEEDED   colorspaces jderobotutil progeo fuzzylib visionlib ) # Librerias de las que depende el componente
 SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Deps) # Directorio donde se encuentran las dependencias
 
 
@@ -63,7 +63,6 @@
 #link_directories(${gsl_LIBRARIES_DIRS})
 
   # FIND AND CHECK OTHER DEPENDENCES
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 include(${DEPS_DIR}/ice/CMakeLists.txt)
 
 

Modified: trunk/src/stable/components/openniServer/build/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/openniServer/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/openniServer/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -62,7 +62,6 @@
 #link_directories(${libgnomecanvasmm_LIBRARY_DIRS})
 
   # FIND AND CHECK OTHER DEPENDENCES
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 include(${DEPS_DIR}/openni2/CMakeLists.txt)
 include(${DEPS_DIR}/nite2/CMakeLists.txt)
 include(${DEPS_DIR}/ice/CMakeLists.txt)

Modified: trunk/src/stable/components/openniServer/build-independent/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/openniServer/build-independent/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/openniServer/build-independent/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -72,13 +72,7 @@
 ENDIF()
 
 
-#PKG_CHECK_MODULES(gearbox gearbox)
-#include_directories(${gearbox_INCLUDE_DIRS})
-#link_directories(${gearbox_LIBRARY_DIRS})
-#message(STATUS "${gearbox_LIBRARY_DIRS}")
-#message(STATUS "${gearbox_INCLUDE_DIRS}")
 
-
 set( CMAKE_CXX_FLAGS "-Wno-deprecated -Wl,-rpath ./" ) # Opciones para el compilador
 
 if (NOT IS_DIRECTORY ./OpenNI2)

Modified: trunk/src/stable/components/replayController/build/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/replayController/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/replayController/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -8,7 +8,7 @@
 SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/cpp) # Directorio con las interfaces ICE en C++
 SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs) # Directorio donde se encuentran las librerias propias de jderobot
 SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/slice) # Directorio donde se encuentran las interfaces ICE
-SET( LIBS_NEEDED   bgfgsegmentation jderobotice colorspaces jderobotutil progeo pioneer fuzzylib visionlib ) # Librerias de las que depende el componente
+SET( LIBS_NEEDED   bgfgsegmentation colorspaces jderobotutil progeo pioneer fuzzylib visionlib ) # Librerias de las que depende el componente
 SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Deps) # Directorio donde se encuentran las dependencias
 
 ###################
@@ -62,7 +62,6 @@
 #link_directories(${gsl_LIBRARIES_DIRS})
 
 # FIND AND CHECK OTHER DEPENDENCES
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 #include(${DEPS_DIR}/fireware/CMakeLists.txt)
 #include(${DEPS_DIR}/pcl/CMakeLists.txt)
 #include(${DEPS_DIR}/xerces/CMakeLists.txt)

Modified: trunk/src/stable/components/replayer/build/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/replayer/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/replayer/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -41,7 +41,6 @@
 include_directories(${gsl_INCLUDE_DIRS})
 link_directories(${gsl_LIBRARIES_DIRS})
 
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 include(${DEPS_DIR}/ice/CMakeLists.txt)
 include(${DEPS_DIR}/opencv/CMakeLists.txt)
 include(${DEPS_DIR}/opengl/CMakeLists.txt)

Modified: trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/rgbdManualCalibrator/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -13,7 +13,8 @@
 
 TARGET_LINK_LIBRARIES( rgbdManualCalibrator
  ${GLUT_LIBRARIES}
- ${opencv_LIBRARIES}
+${opencv_LIBRARIES}
+    ${OpenCVGUI_LIBRARIES}
  ${gtkmm_LIBRARIES}
  ${libglademm_LIBRARIES}
  ${gthread_LIBRARIES}

Modified: trunk/src/stable/components/rgbdManualCalibrator/build/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/rgbdManualCalibrator/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/stable/components/rgbdManualCalibrator/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -8,7 +8,7 @@
 SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/cpp) # Directorio con las interfaces ICE en C++
 SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs) # Directorio donde se encuentran las librerias propias de jderobot
 SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/slice) # Directorio donde se encuentran las interfaces ICE
-SET( LIBS_NEEDED   bgfgsegmentation jderobotice colorspaces jderobotutil progeo pioneer fuzzylib visionlib ) # Librerias de las que depende el componente
+SET( LIBS_NEEDED   bgfgsegmentation colorspaces jderobotutil progeo pioneer fuzzylib visionlib ) # Librerias de las que depende el componente
 SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Deps) # Directorio donde se encuentran las dependencias
 
 ###################
@@ -62,7 +62,6 @@
 #link_directories(${gsl_LIBRARIES_DIRS})
 
 # FIND AND CHECK OTHER DEPENDENCES
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 #include(${DEPS_DIR}/fireware/CMakeLists.txt)
 #include(${DEPS_DIR}/pcl/CMakeLists.txt)
 #include(${DEPS_DIR}/xerces/CMakeLists.txt)

Modified: trunk/src/testing/components/calibrator/build/CMakeLists.txt
===================================================================
--- trunk/src/testing/components/calibrator/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/testing/components/calibrator/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -8,7 +8,7 @@
 SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/cpp) # Directorio con las interfaces ICE en C++
 SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs) # Directorio donde se encuentran las librerias propias de jderobot
 SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/slice) # Directorio donde se encuentran las interfaces ICE
-SET( LIBS_NEEDED progeo colorspaces jderobotutil jderobotice) #bgfgsegmentation jderobotice colorspaces jderobotutil progeo pioneer fuzzylib visionlib ) # Librerias de las que depende el componente
+SET( LIBS_NEEDED progeo colorspaces jderobotutil ) #bgfgsegmentation jderobotice colorspaces jderobotutil progeo pioneer fuzzylib visionlib ) # Librerias de las que depende el componente
 SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Deps) # Directorio donde se encuentran las dependencias
 
 
@@ -62,7 +62,6 @@
 
 
   # FIND AND CHECK OTHER DEPENDENCES
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 #include(${DEPS_DIR}/xerces/CMakeLists.txt)
 include(${DEPS_DIR}/ice/CMakeLists.txt)
 include(${DEPS_DIR}/opencv/CMakeLists.txt)

Modified: trunk/src/testing/components/teleoperator/build/CMakeLists.txt
===================================================================
--- trunk/src/testing/components/teleoperator/build/CMakeLists.txt	2013-10-07 09:50:49 UTC (rev 1007)
+++ trunk/src/testing/components/teleoperator/build/CMakeLists.txt	2013-10-07 10:20:53 UTC (rev 1008)
@@ -8,7 +8,7 @@
 SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/cpp) # Directorio con las interfaces ICE en C++
 SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs) # Directorio donde se encuentran las librerias propias de jderobot
 SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../interfaces/slice) # Directorio donde se encuentran las interfaces ICE
-SET( LIBS_NEEDED   jderobotice jderobotutil colorspaces ) # Librerias de las que depende el componente
+SET( LIBS_NEEDED   jderobotutil colorspaces ) # Librerias de las que depende el componente
 SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Deps) # Directorio donde se encuentran las dependencias
 
 
@@ -35,7 +35,6 @@
 link_directories(${gthread_LIBRARY_DIRS})
 
   # FIND AND CHECK OTHER DEPENDENCES
-include(${DEPS_DIR}/gearbox/CMakeLists.txt)
 include(${DEPS_DIR}/ice/CMakeLists.txt)
 include(${DEPS_DIR}/opencv/CMakeLists.txt)
 

