Revision: 6950
http://playerstage.svn.sourceforge.net/playerstage/?rev=6950&view=rev
Author: gbiggs
Date: 2008-08-12 02:57:00 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
Fixed a bug in setting include dirs for drivers, cleaned up laser_config.h
inclusion.
Modified Paths:
--------------
code/player/trunk/cmake/internal/DriverUtils.cmake
code/player/trunk/server/drivers/laser/CMakeLists.txt
code/player/trunk/server/drivers/laser/sicklms200.cc
Modified: code/player/trunk/cmake/internal/DriverUtils.cmake
===================================================================
--- code/player/trunk/cmake/internal/DriverUtils.cmake 2008-08-11 00:22:53 UTC
(rev 6949)
+++ code/player/trunk/cmake/internal/DriverUtils.cmake 2008-08-12 02:57:00 UTC
(rev 6950)
@@ -41,7 +41,7 @@
MESSAGE (STATUS "WARNING: No sources given for driver ${_name}")
ENDIF (NOT _srcs)
# Add this driver's list of sources to the list of sources for
libplayerdrivers
- PLAYERDRIVER_ADD_TO_BUILT (${_name} "${_includeDir}" "${_libDir}"
"${_linkFlags}" "${_cFlags}" ${_srcs})
+ PLAYERDRIVER_ADD_TO_BUILT (${_name} "${_includeDirs}" "${_libDir}"
"${_linkFlags}" "${_cFlags}" ${_srcs})
ENDIF (${_cumulativeVar})
ENDMACRO (PLAYERDRIVER_ADD_DRIVER)
Modified: code/player/trunk/server/drivers/laser/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/laser/CMakeLists.txt 2008-08-11
00:22:53 UTC (rev 6949)
+++ code/player/trunk/server/drivers/laser/CMakeLists.txt 2008-08-12
02:57:00 UTC (rev 6950)
@@ -1,16 +1,16 @@
-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)
PLAYERDRIVER_OPTION (pbslaser build_pbslaser ON)
PLAYERDRIVER_ADD_DRIVER (pbslaser build_pbslaser SOURCES pbs_driver.cc)
+CHECK_INCLUDE_FILES (linux/serial.h HAVE_LINUX_SERIAL_H)
+SET (laser_config_h_in ${CMAKE_CURRENT_SOURCE_DIR}/laser_config.h.in)
+SET (laser_config_h ${CMAKE_CURRENT_BINARY_DIR}/laser_config.h)
+CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/laser_config.h.in
${CMAKE_CURRENT_BINARY_DIR}/laser_config.h)
PLAYERDRIVER_OPTION (sicklms200 build_sicklms200 ON)
-#PLAYERDRIVER_REQUIRE_HEADER (sicklms200 build_sicklms200 linux/serial.h)
-PLAYERDRIVER_ADD_DRIVER (sicklms200 build_sicklms200 SOURCES sicklms200.cc)
+PLAYERDRIVER_ADD_DRIVER (sicklms200 build_sicklms200 SOURCES sicklms200.cc
${laser_config_h}
+ INCLUDEDIRS ${CMAKE_CURRENT_BINARY_DIR})
IF (HAVE_STL)
PLAYERDRIVER_OPTION (sicklms400 build_sicklms400 ON)
@@ -20,7 +20,6 @@
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_ADD_DRIVER (sicks3000 build_sicks3000 SOURCES sicks3000.cc)
PLAYERDRIVER_OPTION (laserposeinterpolator build_laserposeinterpolator ON)
@@ -36,7 +35,6 @@
PLAYERDRIVER_ADD_DRIVER (lasercutter build_lasercutter SOURCES lasercutter.cc
lasertransform.cc)
PLAYERDRIVER_OPTION (urglaser build_urglaser ON)
-#PLAYERDRIVER_REQUIRE_HEADER (urglaser build_urglaser linux/serial.h)
PLAYERDRIVER_ADD_DRIVER (urglaser build_urglaser SOURCES urg_laser.cc
urglaserdriver.cc)
# Also build and install standalone non-Player lib
PLAYER_ADD_LIBRARY (urglaser_standalone urg_laser.cc)
Modified: code/player/trunk/server/drivers/laser/sicklms200.cc
===================================================================
--- code/player/trunk/server/drivers/laser/sicklms200.cc 2008-08-11
00:22:53 UTC (rev 6949)
+++ code/player/trunk/server/drivers/laser/sicklms200.cc 2008-08-12
02:57:00 UTC (rev 6950)
@@ -199,9 +199,7 @@
#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>
+#include <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.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
