[Playerstage-commit] SF.net SVN: playerstage:[6887] code/player/trunk/server/drivers/laser

[<ge...@us...>]

Revision: 6887
          http://playerstage.svn.sourceforge.net/playerstage/?rev=6887&view=rev
Author:   gerkey
Date:     2008-07-18 17:42:14 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
added config.h for linux/serial.h and modified build of sicklms200 to check it

Modified Paths:
--------------
    code/player/trunk/server/drivers/laser/CMakeLists.txt
    code/player/trunk/server/drivers/laser/sicklms200.cc

Added Paths:
-----------
    code/player/trunk/server/drivers/laser/laser_config.h.in

Modified: code/player/trunk/server/drivers/laser/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/laser/CMakeLists.txt	2008-07-18 03:15:24 UTC (rev 6886)
+++ code/player/trunk/server/drivers/laser/CMakeLists.txt	2008-07-18 17:42:14 UTC (rev 6887)
@@ -1,3 +1,7 @@
+CHECK_INCLUDE_FILES (linux/serial.h HAVE_LINUX_SERIAL_H)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/laser_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/laser_config.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 PLAYERDRIVER_OPTION (bumper2laser build_bumper2laser ON)
 PLAYERDRIVER_ADD_DRIVER (bumper2laser build_bumper2laser SOURCES bumper2laser.cc)
 
@@ -5,7 +9,7 @@
 PLAYERDRIVER_ADD_DRIVER (pbslaser build_pbslaser SOURCES pbs_driver.cc)
 
 PLAYERDRIVER_OPTION (sicklms200 build_sicklms200 ON)
-PLAYERDRIVER_REQUIRE_HEADER (sicklms200 build_sicklms200 linux/serial.h)
+#PLAYERDRIVER_REQUIRE_HEADER (sicklms200 build_sicklms200 linux/serial.h)
 PLAYERDRIVER_ADD_DRIVER (sicklms200 build_sicklms200 SOURCES sicklms200.cc)
 
 IF (HAVE_STL)
@@ -16,7 +20,7 @@
 PLAYERDRIVER_ADD_DRIVER (sicklms400 build_sicklms400 SOURCES lms400_cola.cc sicklms400.cc)
 
 PLAYERDRIVER_OPTION (sicks3000 build_sicks3000 ON)
-PLAYERDRIVER_REQUIRE_HEADER (sicks3000 build_sicks3000 linux/serial.h)
+#PLAYERDRIVER_REQUIRE_HEADER (sicks3000 build_sicks3000 linux/serial.h)
 PLAYERDRIVER_ADD_DRIVER (sicks3000 build_sicks3000 SOURCES sicks3000.cc)
 
 PLAYERDRIVER_OPTION (laserposeinterpolator build_laserposeinterpolator ON)

Added: code/player/trunk/server/drivers/laser/laser_config.h.in
===================================================================
--- code/player/trunk/server/drivers/laser/laser_config.h.in	                        (rev 0)
+++ code/player/trunk/server/drivers/laser/laser_config.h.in	2008-07-18 17:42:14 UTC (rev 6887)
@@ -0,0 +1 @@
+#cmakedefine HAVE_LINUX_SERIAL_H

Modified: code/player/trunk/server/drivers/laser/sicklms200.cc
===================================================================
--- code/player/trunk/server/drivers/laser/sicklms200.cc	2008-07-18 03:15:24 UTC (rev 6886)
+++ code/player/trunk/server/drivers/laser/sicklms200.cc	2008-07-18 17:42:14 UTC (rev 6887)
@@ -199,6 +199,9 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
+// TODO: figure out why this can't be included without using the full path
+//#include <laser_config.h>
+#include <../drivers/laser/laser_config.h>
 
 #undef HAVE_HI_SPEED_SERIAL
 #ifdef HAVE_LINUX_SERIAL_H


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.