From: <bo...@us...> - 2008-02-20 00:30:08
|
Revision: 72 http://gearbox.svn.sourceforge.net/gearbox/?rev=72&view=rev Author: borax00 Date: 2008-02-19 16:30:13 -0800 (Tue, 19 Feb 2008) Log Message: ----------- Modified Paths: -------------- gearbox/trunk/src/urg_nz/example.cmake gearbox/trunk/submitted/gbxserialacfr/serial.cpp gearbox/trunk/submitted/gbxsickacfr/driver.cpp Modified: gearbox/trunk/src/urg_nz/example.cmake =================================================================== --- gearbox/trunk/src/urg_nz/example.cmake 2008-02-19 06:15:55 UTC (rev 71) +++ gearbox/trunk/src/urg_nz/example.cmake 2008-02-20 00:30:13 UTC (rev 72) @@ -1,10 +1,10 @@ PROJECT( urg_nz_example ) -INCLUDE_DIRECTORIES( @CMAKE_INSTALL_PREFIX@ ) +INCLUDE_DIRECTORIES( /usr/local ) ADD_EXECUTABLE( urg_nz_example example.cpp ) TARGET_LINK_LIBRARIES( urg_nz_example urg_nz ) SET_TARGET_PROPERTIES( urg_nz_example PROPERTIES - LINK_FLAGS "-L@CMAKE_INSTALL_PREFIX@/lib/gearbox" - INSTALL_RPATH "${INSTALL_RPATH};@CMAKE_INSTALL_PREFIX@/lib/gearbox" - BUILD_WITH_INSTALL_RPATH TRUE ) \ No newline at end of file + LINK_FLAGS "-L/usr/local/lib/gearbox" + INSTALL_RPATH "${INSTALL_RPATH};/usr/local/lib/gearbox" + BUILD_WITH_INSTALL_RPATH TRUE ) Modified: gearbox/trunk/submitted/gbxserialacfr/serial.cpp =================================================================== --- gearbox/trunk/submitted/gbxserialacfr/serial.cpp 2008-02-19 06:15:55 UTC (rev 71) +++ gearbox/trunk/submitted/gbxserialacfr/serial.cpp 2008-02-20 00:30:13 UTC (rev 72) @@ -417,7 +417,7 @@ perror("Serial::close():close()"); } - //Make sure that we force this back to an invalid state + // Make sure that we force this back to an invalid state portFd_ = -1; } Modified: gearbox/trunk/submitted/gbxsickacfr/driver.cpp =================================================================== --- gearbox/trunk/submitted/gbxsickacfr/driver.cpp 2008-02-19 06:15:55 UTC (rev 71) +++ gearbox/trunk/submitted/gbxsickacfr/driver.cpp 2008-02-20 00:30:13 UTC (rev 72) @@ -87,7 +87,7 @@ Config::toString() const { std::stringstream ss; - ss << "Laser driver config: minr="<<minRange<<" maxr="<<maxRange<<" fov="<<RAD2DEG(fieldOfView)<<"deg start="<<RAD2DEG(startAngle)<<"deg num="<<numberOfSamples; + ss << "Laser driver config: device="<<device<<", baudRate="<<baudRate<<", minr="<<minRange<<", maxr="<<maxRange<<", fov="<<RAD2DEG(fieldOfView)<<"deg, start="<<RAD2DEG(startAngle)<<"deg, num="<<numberOfSamples; return ss.str(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |