changed name of qhull project to simox-qhull to avoid issues when installing...

changed name of qhull project to simox-qhull to avoid issues when installing simox together with a different qhull verson

git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@647 042f3d55-54a8-47e9-b7fb-15903f145c44

CMakeLists.txt

@@ -28,7 +28,7 @@ endif()
 if (Simox_BUILD_GraspStudio)
     add_subdirectory(GraspPlanning)
     list(APPEND SIMOX_EXPORT_TARGET_LIST GraspStudio)
-    list(APPEND SIMOX_EXPORT_TARGET_LIST qhull)
+    list(APPEND SIMOX_EXPORT_TARGET_LIST simox-qhull)
     list(APPEND SIMOX_EXPORT_TARGET_LIST powercrust)
     list (APPEND Simox_LIBRARIES GraspStudio)
 endif()

GraspPlanning/CMakeLists.txt

@@ -126,7 +126,7 @@ ADD_DEFINITIONS(${Simox_EXTERNAL_LIBRARY_FLAGS})
 
 
 ADD_LIBRARY (GraspStudio SHARED ${SOURCES} ${INCLUDES})
-TARGET_LINK_LIBRARIES (GraspStudio Saba VirtualRobot ${Simox_EXTERNAL_LIBRARIES} qhull powercrust)
+TARGET_LINK_LIBRARIES (GraspStudio Saba VirtualRobot ${Simox_EXTERNAL_LIBRARIES} simox-qhull powercrust)
 
 # .DLL path
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR})

GraspPlanning/ExternalDependencies/qhull-2003.1/CMakeLists.txt

-PROJECT(qhull)
+PROJECT(simox-qhull)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
 CMAKE_POLICY(VERSION 2.6)

VirtualRobot/RobotFactory.cpp

@@ -229,7 +229,7 @@ RobotPtr RobotFactory::cloneChangeStructure(RobotPtr robot, robotStructureDef &n
 
     }
     // apply all transformations
-    std::map<RobotNodePtr, Eigen::Matrix4f>::iterator it = localTransformations.begin();
+    std::map<RobotNodePtr, Eigen::Matrix4f, std::less<RobotNodePtr>, Eigen::aligned_allocator<std::pair<const int, Eigen::Matrix4f> > >::iterator it = localTransformations.begin();
     while (it != localTransformations.end())
     {
         it->first->localTransformation = it->second;