[Personalrobots-commit] SF.net SVN: personalrobots:[9963] pkg/trunk

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

Revision: 9963
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=9963&view=rev
Author:   gerkey
Date:     2009-01-22 17:01:19 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
Fixed libTF / tf build on OS X

Modified Paths:
--------------
    pkg/trunk/deprecated/libTF/CMakeLists.txt
    pkg/trunk/deprecated/libTF/manifest.xml
    pkg/trunk/util/tf/test/cache_unittest.cpp
    pkg/trunk/util/tf/test/tf_unittest.cpp

Modified: pkg/trunk/deprecated/libTF/CMakeLists.txt
===================================================================
--- pkg/trunk/deprecated/libTF/CMakeLists.txt	2009-01-22 16:08:54 UTC (rev 9962)
+++ pkg/trunk/deprecated/libTF/CMakeLists.txt	2009-01-22 17:01:19 UTC (rev 9963)
@@ -2,18 +2,18 @@
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 rospack(libTF)
 
-rospack_add_library(TF src/libTF.cpp src/Pose3DCache.cpp src/Pose3D.cpp)
+rospack_add_library(oldTF src/libTF.cpp src/Pose3DCache.cpp src/Pose3D.cpp)
 rospack_add_executable(simpletest src/test/main.cpp)
-target_link_libraries(simpletest TF)
+target_link_libraries(simpletest oldTF)
 rospack_add_executable(testtf src/test/testtf.cc)
-target_link_libraries(testtf TF)
+target_link_libraries(testtf oldTF)
 rospack_add_executable(test_interp src/test/test_interp.cc)
-target_link_libraries(test_interp TF)
+target_link_libraries(test_interp oldTF)
 rospack_add_executable(testMatrix src/test/testMatrix.cc)
-target_link_libraries(testMatrix TF)
+target_link_libraries(testMatrix oldTF)
 rospack_add_executable(testMatrixQuaternion src/test/testMatrixQuaternion.cc)
-target_link_libraries(testMatrixQuaternion TF)
+target_link_libraries(testMatrixQuaternion oldTF)
 rospack_add_gtest(pose3d_unittest test/pose3d_unittest.cpp src/Pose3D.cpp)
-target_link_libraries(pose3d_unittest TF)
+target_link_libraries(pose3d_unittest oldTF)
 rospack_add_gtest(libTF_unittest test/libTF_unittest.cpp)
-target_link_libraries(libTF_unittest TF)
+target_link_libraries(libTF_unittest oldTF)

Modified: pkg/trunk/deprecated/libTF/manifest.xml
===================================================================
--- pkg/trunk/deprecated/libTF/manifest.xml	2009-01-22 16:08:54 UTC (rev 9962)
+++ pkg/trunk/deprecated/libTF/manifest.xml	2009-01-22 17:01:19 UTC (rev 9963)
@@ -15,6 +15,6 @@
 <depend package="std_msgs"/>
 <depend package="roscpp"/>
 <export>
-<cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lTF"/>
+<cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -loldTF"/>
 </export>
 </package>

Modified: pkg/trunk/util/tf/test/cache_unittest.cpp
===================================================================
--- pkg/trunk/util/tf/test/cache_unittest.cpp	2009-01-22 16:08:54 UTC (rev 9962)
+++ pkg/trunk/util/tf/test/cache_unittest.cpp	2009-01-22 17:01:19 UTC (rev 9963)
@@ -465,13 +465,13 @@
   cache.getData(ros::Time().fromNSec(1), stor);
   
   printf(" stor is %f\n", stor.getOrigin().x());
-  EXPECT_TRUE(!isnan(stor.getOrigin().x()));
-  EXPECT_TRUE(!isnan(stor.getOrigin().y()));
-  EXPECT_TRUE(!isnan(stor.getOrigin().z()));
-  EXPECT_TRUE(!isnan(stor.getRotation().x()));
-  EXPECT_TRUE(!isnan(stor.getRotation().y()));
-  EXPECT_TRUE(!isnan(stor.getRotation().z()));
-  EXPECT_TRUE(!isnan(stor.getRotation().w()));
+  EXPECT_TRUE(!std::isnan(stor.getOrigin().x()));
+  EXPECT_TRUE(!std::isnan(stor.getOrigin().y()));
+  EXPECT_TRUE(!std::isnan(stor.getOrigin().z()));
+  EXPECT_TRUE(!std::isnan(stor.getRotation().x()));
+  EXPECT_TRUE(!std::isnan(stor.getRotation().y()));
+  EXPECT_TRUE(!std::isnan(stor.getRotation().z()));
+  EXPECT_TRUE(!std::isnan(stor.getRotation().w()));
 }
 
 int main(int argc, char **argv){

Modified: pkg/trunk/util/tf/test/tf_unittest.cpp
===================================================================
--- pkg/trunk/util/tf/test/tf_unittest.cpp	2009-01-22 16:08:54 UTC (rev 9962)
+++ pkg/trunk/util/tf/test/tf_unittest.cpp	2009-01-22 17:01:19 UTC (rev 9963)
@@ -1199,13 +1199,13 @@
   tf::Stamped<tf::Transform>  output;
   try{
     mTR.lookupTransform("parent", "b" , ros::Time().fromNSec(4000), output);
-    EXPECT_TRUE(!isnan(output.getOrigin().x()));
-    EXPECT_TRUE(!isnan(output.getOrigin().y()));
-    EXPECT_TRUE(!isnan(output.getOrigin().z()));
-    EXPECT_TRUE(!isnan(output.getRotation().x()));
-    EXPECT_TRUE(!isnan(output.getRotation().y()));
-    EXPECT_TRUE(!isnan(output.getRotation().z()));
-    EXPECT_TRUE(!isnan(output.getRotation().w()));
+    EXPECT_TRUE(!std::isnan(output.getOrigin().x()));
+    EXPECT_TRUE(!std::isnan(output.getOrigin().y()));
+    EXPECT_TRUE(!std::isnan(output.getOrigin().z()));
+    EXPECT_TRUE(!std::isnan(output.getRotation().x()));
+    EXPECT_TRUE(!std::isnan(output.getRotation().y()));
+    EXPECT_TRUE(!std::isnan(output.getRotation().z()));
+    EXPECT_TRUE(!std::isnan(output.getRotation().w()));
   }
   catch (...)
   {


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