Merge pull request #174 from jcarpent/devel

Correct travis + fix hpp-fcl issues

CMakeLists.txt

@@ -66,7 +66,7 @@ ADD_OPTIONAL_DEPENDENCY("eigenpy >= 1.3.0")
 ADD_OPTIONAL_DEPENDENCY("metapod >= 1.0.7")
 ADD_OPTIONAL_DEPENDENCY("urdfdom >= 0.2.10")
 ADD_OPTIONAL_DEPENDENCY("lua5.1")
-ADD_OPTIONAL_DEPENDENCY("hpp-fcl")
+ADD_OPTIONAL_DEPENDENCY("hpp-fcl >= 0.4.1")
 IF(HPP_FCL_FOUND AND URDFDOM_FOUND)
   ADD_REQUIRED_DEPENDENCY("assimp >= 3.0")
 ENDIF(HPP_FCL_FOUND AND URDFDOM_FOUND)
@@ -247,6 +247,7 @@ SET(HEADERS
 LIST(REMOVE_DUPLICATES HEADERS)
 
 PKG_CONFIG_APPEND_LIBS (${PROJECT_NAME})
+PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_COMPONENTS})
 
 MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio")
 MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/math")

cmake @ 57838adc

-Subproject commit 5663a002a905b5c8d84a69d8e74044a8e34a48ed
+Subproject commit 57838adc2c73410b4b2c9af39c014e640fbbac7b

python/tests.py

@@ -7,8 +7,8 @@ from bindings_SE3 import TestSE3Bindings
 from bindings_force import TestForceBindings
 from bindings_motion import TestMotionBindings
 from bindings_inertia import TestInertiaBindings
-# from bindings_frame import TestFrameBindings # No geometry module yet on travis
-# from bindings_geometry_object import TestGeometryObjectBindings  # Python Class RobotWrapper needs geometry module to not raise Exception
+from bindings_frame import TestFrameBindings # No geometry module yet on travis
+from bindings_geometry_object import TestGeometryObjectBindings  # Python Class RobotWrapper needs geometry module to not raise Exception
 from explog import TestExpLog  # noqa
 from model import TestModel  # noqa
 from rpy import TestRPY  # noqa

src/CMakeLists.txt

@@ -66,6 +66,7 @@ IF (UNIX)
     ADD_LIBRARY ( ${PROJECT_NAME} SHARED ${HEADERS} ${${PROJECT_NAME}_SOURCES} )
 		SET_TARGET_PROPERTIES( ${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
     PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} eigen3)
+    TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${Boost_LIBRARIES})
 
     IF(URDFDOM_FOUND)
       PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} urdfdom)

travis_custom/custom_before_install

@@ -6,7 +6,7 @@ set -x
 set -v
 
 # Add robotpkg 
-sudo sh -c "echo \"deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian trusty robotpkg\" >> /etc/apt/sources.list "
+sudo sh -c "echo \"deb [arch=amd64] http://robotpkg.openrobots.org/packages/debian/pub trusty robotpkg\" >> /etc/apt/sources.list "
 curl http://robotpkg.openrobots.org/packages/debian/robotpkg.key | sudo apt-key add -
 
 # show memory usage before install
@@ -17,7 +17,7 @@ export APT_DEPENDENCIES="doxygen libboost-system-dev libboost-test-dev libboost-
 # Add Python dependency
 export APT_DEPENDENCIES=$APT_DEPENDENCIES" libboost-python-dev robotpkg-eigenpy python2.7-dev python-numpy"
 # Add Geometry dependencies
-#export APT_DEPENDENCIES=$APT_DEPENDENCIES" robotpkg-hpp-fcl robotpkg-assimp robotpkg-octomap"
+export APT_DEPENDENCIES=$APT_DEPENDENCIES" robotpkg-hpp-fcl robotpkg-assimp robotpkg-octomap"
 
 # When this script is called the current directory is ./custom_travis
 . ./.travis/run ../.travis/before_install

travis_custom/custom_build

@@ -6,7 +6,7 @@ set -x
 set -v
 
 # Setup environment variables.
-export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DBUILD_BENCHMARK=\"ON\" -DBUILD_UNIT_TESTS=\"ON\" "
+export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DBUILD_BENCHMARK=\"ON\" -DBUILD_UNIT_TESTS=\"ON\" -DCMAKE_CXX_FLAGS=-DBOOST_SYSTEM_NO_DEPRECATED"
 export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/openrobots/lib/pkgconfig"
 export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/openrobots/lib"
 # Setup environment variables.