Merge pull request #25 from jcarpent/devel

Minor fixes

.gitignore

+build*
+Xcode/*

CMakeLists.txt

@@ -44,6 +44,19 @@ set(PROJECT_DESCRIPTION
   )
 set(PROJECT_URL "http://github.com/humanoid-path-planner/hpp-fcl")
 
+IF(APPLE)
+  SET(CMAKE_MACOSX_RPATH TRUE)
+  SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+  SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+  if("${isSystemDir}" STREQUAL "-1")
+     set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+  endif("${isSystemDir}" STREQUAL "-1")
+ENDIF(APPLE)
+
 setup_project()
 
 add_required_dependency("eigen3 >= 3.0.0")

include/hpp/fcl/collision_data.h

@@ -469,12 +469,26 @@ public:
   /// @brief whether two DistanceResult are the same or not
   inline bool operator ==(const DistanceResult& other) const
   {
-    return min_distance == other.min_distance
-        && o1 == other.o1
-        && o2 == other.o2
-        && nearest_points[0] == other.nearest_points[0]
-        && nearest_points[1] == other.nearest_points[1];
+    bool is_same = min_distance == other.min_distance
+                  && nearest_points[0] == other.nearest_points[0]
+                  && nearest_points[1] == other.nearest_points[1]
+                  && o1 == other.o1
+                  && o2 == other.o2
+                  && b1 == other.b1
+                  && b2 == other.b2;
+
+// TODO: check also that two GeometryObject are indeed equal.
+    if (o1 != NULL xor other.o1 != NULL) return false;
+    is_same &= (o1 == other.o1);
+//    else if (o1 != NULL and other.o1 != NULL) is_same &= *o1 == *other.o1;
+
+    if (o2 != NULL xor other.o2 != NULL) return false;
+    is_same &= (o2 == other.o2);
+//    else if (o2 != NULL and other.o2 != NULL) is_same &= *o2 == *other.o2;
+  
+    return is_same;
   }
+
 };
 
 }

test/CMakeLists.txt

@@ -44,6 +44,7 @@ add_fcl_test(test_fcl_capsule_box_2 test_fcl_capsule_box_2.cpp test_fcl_utility.
 add_fcl_test(test_fcl_bvh_models test_fcl_bvh_models.cpp test_fcl_utility.cpp)
 
 add_fcl_test(test_fcl_profiling test_fcl_profiling.cpp test_fcl_utility.cpp)
+PKG_CONFIG_USE_DEPENDENCY(test_fcl_profiling assimp)
 
 if (FCL_HAVE_OCTOMAP)
   add_fcl_test(test_fcl_octomap test_fcl_octomap.cpp test_fcl_utility.cpp)