[Jderobot-admin] jderobot-r900 - in trunk: . src/components src/components/openniServer-kinect src/components/openniServer-kinect/build src/components/openniServer-kinect/build-independent

[frivas en jderobot.org]

Author: frivas
Date: 2013-04-16 10:45:20 +0200 (Tue, 16 Apr 2013)
New Revision: 900

Added:
   trunk/src/components/openniServer-kinect/
Removed:
   trunk/src/components/openniServer/
Modified:
   trunk/CMakeLists.txt
   trunk/src/components/openniServer-kinect/CMakeLists.txt
   trunk/src/components/openniServer-kinect/build-independent/CMakeLists.txt
   trunk/src/components/openniServer-kinect/build/CMakeLists.txt
Log:
renombrado openniserver con openni1 a openniServer-kinect


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2013-04-10 06:44:26 UTC (rev 899)
+++ trunk/CMakeLists.txt	2013-04-16 08:45:20 UTC (rev 900)
@@ -11,13 +11,13 @@
 SET( LIBS_NEEDED   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
-SET( COMPONENTS calibrator  calibratorKinect openniServer naooperator         basic_component		         
+SET( COMPONENTS calibrator  calibratorKinect openniServer-kinect naooperator         basic_component		         
 		bgfglab                    opencvdemo
 					cameraserver         introrob            
 		cameraview			recorder
 		cameraview_icestorm  kinectViewer        replayer
 		wiimoteClient
-		wiimoteServer       colortuner teleoperatorPC
+		wiimoteServer       colortuner
 		
 ) #Componentes que forman JDErobot
 
@@ -98,6 +98,8 @@
 include(${DEPS_DIR}/cwiid/CMakeLists.txt)
 include(${DEPS_DIR}/opencv/CMakeLists.txt)
 include(${DEPS_DIR}/opengl/CMakeLists.txt)
+include(${DEPS_DIR}/openni2/CMakeLists.txt)
+include(${DEPS_DIR}/nite2/CMakeLists.txt)
 #include(${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/CMakeLists.txt)
 
 

Modified: trunk/src/components/openniServer-kinect/CMakeLists.txt
===================================================================
--- trunk/src/components/openniServer/CMakeLists.txt	2013-04-10 06:44:26 UTC (rev 899)
+++ trunk/src/components/openniServer-kinect/CMakeLists.txt	2013-04-16 08:45:20 UTC (rev 900)
@@ -1,6 +1,6 @@
 IF(openni_LIBRARIES)
     IF(nite_LIBRARIES)
-	    SET( SOURCE_FILES openniServer.cpp myprogeo.cpp )
+	    SET( SOURCE_FILES openniServer-kinect.cpp myprogeo.cpp )
 	    add_definitions(-DGLADE_DIR="${gladedir}")
 
 	    set( CMAKE_CXX_FLAGS "-Wno-deprecated" ) # Opciones para el compilador-lgsl -lgslcblas -lGL -lGLU -lglut -lgazebo
@@ -14,9 +14,9 @@
 	        ${ni_INCLUDE_DIR}
         )
 
-	    add_executable (openniServer ${SOURCE_FILES})
+	    add_executable (openniServer-kinect ${SOURCE_FILES})
 
-        TARGET_LINK_LIBRARIES(openniServer
+        TARGET_LINK_LIBRARIES(openniServer-kinect
             ${LIBS_DIR}/jderobotice/libjderobotice.so
             ${LIBS_DIR}/jderobotutil/libjderobotutil.so
             ${LIBS_DIR}/progeo/libprogeo.so

Modified: trunk/src/components/openniServer-kinect/build/CMakeLists.txt
===================================================================
--- trunk/src/components/openniServer/build/CMakeLists.txt	2013-04-10 06:44:26 UTC (rev 899)
+++ trunk/src/components/openniServer-kinect/build/CMakeLists.txt	2013-04-16 08:45:20 UTC (rev 900)
@@ -1,4 +1,4 @@
-project (JDEROBOT_OPENNISERVER)
+project (JDEROBOT_OPENNISERVER-KINECT)
 
 cmake_minimum_required(VERSION 2.8)
 

Modified: trunk/src/components/openniServer-kinect/build-independent/CMakeLists.txt
===================================================================
--- trunk/src/components/openniServer/build-independent/CMakeLists.txt	2013-04-10 06:44:26 UTC (rev 899)
+++ trunk/src/components/openniServer-kinect/build-independent/CMakeLists.txt	2013-04-16 08:45:20 UTC (rev 900)
@@ -1,5 +1,5 @@
  cmake_minimum_required(VERSION 2.8)
-SET( SOURCE_FILES ../openniServer.cpp ../myprogeo.cpp)
+SET( SOURCE_FILES ../openniServer-kinect.cpp ../myprogeo.cpp)
 SET( LIBS_DIR /usr/local/lib/jderobot/)
 
 
@@ -8,7 +8,7 @@
 	  /usr/local/include/jderobot
 )
 
-add_executable (openniServer  ${SOURCE_FILES})
+add_executable (openniServer-kinect  ${SOURCE_FILES})
 
 #automated opencv
 include(FindPkgConfig)
@@ -109,7 +109,7 @@
 set( CMAKE_CXX_FLAGS "-Wno-deprecated -Wl,-rpath ./" ) # Opciones para el compilador
 
 
-TARGET_LINK_LIBRARIES(openniServer
+TARGET_LINK_LIBRARIES(openniServer-kinect
   ${opencv_LIBRARIES}
   ${gsl_LIBRARIES}
   ${Gearbox_LIBRARIES}