[Jderobot-admin] jderobot-r885 - in trunk: Deps/openni src/components/cameraserver src/components/openniServer

[lr.morales en jderobot.org]

Author: lr.morales
Date: 2013-03-13 01:39:14 +0100 (Wed, 13 Mar 2013)
New Revision: 885

Modified:
   trunk/Deps/openni/CMakeLists.txt
   trunk/src/components/cameraserver/cameraserver.cfg
   trunk/src/components/openniServer/CMakeLists.txt
Log:
[lr.morales]	OpenNI CMakeLists now searchs the include directory under the 
		suffixes of ni and openni, as needed in some systems.

		openniserver CMake changes checks with_openni and with_nite
		with openni_LIBRARIES and nite_LIBRARIES, as former ones
		are dropped by OpenNI CMake.

		Changed cameraserver.cfg CameraSrv.Camera.0.Uri to point 
		again /dev/video0.
		


Modified: trunk/Deps/openni/CMakeLists.txt
===================================================================
--- trunk/Deps/openni/CMakeLists.txt	2013-03-12 09:58:00 UTC (rev 884)
+++ trunk/Deps/openni/CMakeLists.txt	2013-03-13 00:39:14 UTC (rev 885)
@@ -1,6 +1,6 @@
 # CHECK OPENNI
-FIND_PATH( openni_INCLUDE_DIR NAMES XnOpenNI.h  PATHS ENV C++LIB ENV PATH PATH_SUFFIXES ni)
- 
+FIND_PATH( openni_INCLUDE_DIR NAMES XnOpenNI.h  PATHS ENV C++LIB ENV PATH PATH_SUFFIXES ni openni)
+
 IF( openni_INCLUDE_DIR )
     FIND_LIBRARY( openni_LIBRARIES NAMES OpenNI PATHS ENV C++LIB ENV PATH PATH_SUFFIXES lib lib64)
     IF( openni_LIBRARIES)

Modified: trunk/src/components/cameraserver/cameraserver.cfg
===================================================================
--- trunk/src/components/cameraserver/cameraserver.cfg	2013-03-12 09:58:00 UTC (rev 884)
+++ trunk/src/components/cameraserver/cameraserver.cfg	2013-03-13 00:39:14 UTC (rev 885)
@@ -2,7 +2,7 @@
 CameraSrv.DefaultMode=1
 CameraSrv.NCameras=1
 CameraSrv.Camera.0.Name=cameraA
-CameraSrv.Camera.0.Uri=file:///home/mikel/Descargas/csur2.avi
+CameraSrv.Camera.0.Uri=v4l2:///dev/video0
 CameraSrv.Camera.0.FramerateN=15
 CameraSrv.Camera.0.FramerateD=1
 CameraSrv.Camera.0.Format=RGB8

Modified: trunk/src/components/openniServer/CMakeLists.txt
===================================================================
--- trunk/src/components/openniServer/CMakeLists.txt	2013-03-12 09:58:00 UTC (rev 884)
+++ trunk/src/components/openniServer/CMakeLists.txt	2013-03-13 00:39:14 UTC (rev 885)
@@ -1,5 +1,5 @@
-IF(with_openni)
-    IF(with_nite)
+IF(openni_LIBRARIES)
+    IF(nite_LIBRARIES)
 	    SET( SOURCE_FILES openniServer.cpp myprogeo.cpp )
 	    add_definitions(-DGLADE_DIR="${gladedir}")