[Jderobot-admin] jderobot-r1063 - in trunk: Deps/libusb src/stable/components/openni1Server

[rocapal en jderobot.org]

Author: rocapal
Date: 2013-10-18 10:30:19 +0200 (Fri, 18 Oct 2013)
New Revision: 1063

Modified:
   trunk/Deps/libusb/CMakeLists.txt
   trunk/src/stable/components/openni1Server/CMakeLists.txt
Log:
include and libs added in cmake of the component


Modified: trunk/Deps/libusb/CMakeLists.txt
===================================================================
--- trunk/Deps/libusb/CMakeLists.txt	2013-10-18 00:47:33 UTC (rev 1062)
+++ trunk/Deps/libusb/CMakeLists.txt	2013-10-18 08:30:19 UTC (rev 1063)
@@ -1,6 +1,4 @@
 pkg_check_modules(LIBUSB QUIET libusb-1.0)
-include_directories(${LIBUSB_INCLUDE_DIRS})
-link_directories(${LIBUSB_LIBRARY_DIRS})
 
 if (LIBUSB_INCLUDE_DIRS)
 	MESSAGE("*** libusb FOUND")

Modified: trunk/src/stable/components/openni1Server/CMakeLists.txt
===================================================================
--- trunk/src/stable/components/openni1Server/CMakeLists.txt	2013-10-18 00:47:33 UTC (rev 1062)
+++ trunk/src/stable/components/openni1Server/CMakeLists.txt	2013-10-18 08:30:19 UTC (rev 1063)
@@ -10,8 +10,9 @@
             ${LIBS_DIR}/
             ${CMAKE_CURRENT_SOURCE_DIR}
             ${CMAKE_CURRENT_SOURCE_DIR}/cameras
-	        ${nite_INCLUDE_DIR}
-	        ${ni_INCLUDE_DIR}
+	    ${nite_INCLUDE_DIR}
+	    ${ni_INCLUDE_DIR}
+            ${LIBUSB_INCLUDE_DIRS}
         )
 
 	    add_executable (openni1Server ${SOURCE_FILES})
@@ -27,6 +28,7 @@
             ${gsl_LIBRARIES}
             ${LIBUSB_LIBRARIES}
             ${CMAKE_THREAD_LIBS_INIT}
+	    ${LIBUSB_LIBRARY_DIRS}
         )
     ENDIF()
 ENDIF()