[Jderobot-admin] jderobot-r940 - in trunk: . Deps/gearbox Deps/pcl

[frivas en jderobot.org]

Author: frivas
Date: 2013-07-16 07:50:06 +0200 (Tue, 16 Jul 2013)
New Revision: 940

Modified:
   trunk/CMakeLists.txt
   trunk/Deps/gearbox/CMakeLists.txt
   trunk/Deps/pcl/CMakeLists.txt
Log:
modificaciones en las dependencias y a?\195?\177adido condicional para gearbox en el cmakelist principal


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2013-07-11 12:47:25 UTC (rev 939)
+++ trunk/CMakeLists.txt	2013-07-16 05:50:06 UTC (rev 940)
@@ -4,24 +4,42 @@
 
 # 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/interfaces/cpp) # Directorio con las interfaces ICE en C++
 SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libs) # Directorio donde se encuentran las librerias propias de jderobot
 SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/interfaces/slice) # Directorio donde se encuentran las interfaces ICE
-SET( LIBS_NEEDED   bgfgsegmentation colorspaces jderobotice jderobotutil progeo pioneer fuzzylib visionlib ) # 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
-SET( COMPONENTS calibrator  calibratorKinect openniServer-kinect naooperator         basic_component		         
-		bgfglab                    opencvdemo
+IF( Gearbox_INCLUDE_DIR ) 
+	#librerías que dependen de gearbox
+	SET( LIBS_NEEDED   ${LIBS_NEEDED} bgfgsegmentation jderobotice )
+ENDIF()
+
+
+
+SET( COMPONENTS calibrator  calibratorKinect  naooperator         basic_component		         
+		                    opencvdemo
 					cameraserver         introrob            
 		cameraview			recorder
-		cameraview_icestorm  kinectViewer        replayer
+		cameraview_icestorm  kinectViewer        
 		wiimoteClient
-		wiimoteServer       colortuner openniServer replayController
+		       colortuner replayController
+
+
 		
 ) #Componentes que forman JDErobot
 
+IF( Gearbox_INCLUDE_DIR ) 
+	#librerías que dependen de gearbox
+	SET( COMPONENTS   ${COMPONENTS}  bgfglab replayer wiimoteServer)
+ENDIF()
 
+
+
 ###################
 #                 #
 #  CHECK SYSTEM   #
@@ -87,7 +105,7 @@
 ENDFOREACH(LibFile)
 
   # 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}/openni/CMakeLists.txt)

Modified: trunk/Deps/gearbox/CMakeLists.txt
===================================================================
--- trunk/Deps/gearbox/CMakeLists.txt	2013-07-11 12:47:25 UTC (rev 939)
+++ trunk/Deps/gearbox/CMakeLists.txt	2013-07-16 05:50:06 UTC (rev 940)
@@ -1,4 +1,5 @@
 FIND_PATH( Gearbox_INCLUDE_DIR NAMES gbxutilacfr/gbxutilacfr.h  PATHS ENV C++LIB ENV PATH PATH_SUFFIXES gearbox)
+#FIND_PATH( Gearbox_INCLUDE_DIR NAMES noexiste.h  PATHS ENV C++LIB ENV PATH PATH_SUFFIXES gearbox)
  
 IF( Gearbox_INCLUDE_DIR )
     FIND_LIBRARY( Gearbox_LIBRARY1 NAMES GbxUtilAcfr PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib/gearbox lib64/gearbox )
@@ -9,6 +10,7 @@
 		include_directories(${Gearbox_INCLUDE_DIR})
 		link_directories(${Gearbox_LIBRARIES})
     ENDIF( Gearbox_LIBRARIES )
+ELSE()
 ENDIF(Gearbox_INCLUDE_DIR)
 
 IF(NOT Gearbox_LIBRARIES)

Modified: trunk/Deps/pcl/CMakeLists.txt
===================================================================
--- trunk/Deps/pcl/CMakeLists.txt	2013-07-11 12:47:25 UTC (rev 939)
+++ trunk/Deps/pcl/CMakeLists.txt	2013-07-16 05:50:06 UTC (rev 940)
@@ -31,9 +31,41 @@
     FIND_LIBRARY( pcl_LIBRARY8 NAMES pcl_features PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
     FIND_LIBRARY( pcl_LIBRARY9 NAMES pcl_kdtree PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
     FIND_LIBRARY( pcl_LIBRARY11 NAMES pcl_common PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
-    SET (pcl_LIBRARIES ${pcl_LIBRARY1} ${pcl_LIBRARY2} ${pcl_LIBRARY3} ${pcl_LIBRARY4} ${pcl_LIBRARY5} ${pcl_LIBRARY6} ${pcl_LIBRARY7} ${pcl_LIBRARY8} ${pcl_LIBRARY9} ${pcl_LIBRARY11})
+	IF (pcl_LIBRARY1)
+		SET (pcl_LIBRARIES ${pcl_LIBRARY1})
+	ENDIF()
+	IF (pcl_LIBRARY2)
+		SET (pcl_LIBRARIES ${pcl_LIBRARY2})
+	ENDIF()
+	IF (pcl_LIBRARY3)
+		SET (pcl_LIBRARIES ${pcl_LIBRARY3})
+	ENDIF()
+	IF (pcl_LIBRARY4)
+		SET (pcl_LIBRARIES ${pcl_LIBRARY4})
+	ENDIF()
+	IF (pcl_LIBRARY5)
+		SET (pcl_LIBRARIES ${pcl_LIBRARY5})
+	ENDIF()
+	IF (pcl_LIBRARY6)
+		SET (pcl_LIBRARIES ${pcl_LIBRARY6})
+	ENDIF()
+	IF (pcl_LIBRARY7)
+		SET (pcl_LIBRARIES ${pcl_LIBRARY7})
+	ENDIF()
+	IF (pcl_LIBRARY8)
+		SET (pcl_LIBRARIES ${pcl_LIBRARY8})
+	ENDIF()
+	IF (pcl_LIBRARY9)
+		SET (pcl_LIBRARIES ${pcl_LIBRARY9})
+	ENDIF()
+	IF (pcl_LIBRARY10)
+		SET (pcl_LIBRARIES ${pcl_LIBRARY10})
+	ENDIF()
+	IF (pcl_LIBRARY11)
+		SET (pcl_LIBRARIES ${pcl_LIBRARY11})
+	ENDIF()
     IF( pcl_LIBRARIES )
-		#MESSAGE("PCL LIBRARY FOUND IN ${pcl_LIBRARIES}")
+		MESSAGE("PCL LIBRARY FOUND IN ${pcl_LIBRARIES}")
     ENDIF( pcl_LIBRARIES )
 ENDIF(pcl_INCLUDE_DIR)