From 88e4d79b6a7a7b560174b4f3960eaf499df9de2e Mon Sep 17 00:00:00 2001 From: mnaveau <maximilien.naveau@laas.fr> Date: Mon, 23 May 2016 16:48:24 +0200 Subject: [PATCH] remove the install of jrl-mathtools via robotpkg --- travis_custom/custom_before_install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/travis_custom/custom_before_install b/travis_custom/custom_before_install index a34b630c..7c508183 100755 --- a/travis_custom/custom_before_install +++ b/travis_custom/custom_before_install @@ -23,7 +23,7 @@ export APT_DEPENDENCIES="doxygen doxygen-latex libboost-all-dev libeigen3-dev li # Add urdfdom from ros hydro export APT_DEPENDENCIES=$APT_DEPENDENCIES" ros-hydro-urdfdom ros-hydro-urdfdom-headers" # Add dependencies from robot-pkg -export APT_DEPENDENCIES=$APT_DEPENDENCIES" robotpkg-jrl-mal+jrl-mathtools" +#export APT_DEPENDENCIES=$APT_DEPENDENCIES" robotpkg-jrl-mal+jrl-mathtools" # add valgrind to debug export APT_DEPENDENCIES=$APT_DEPENDENCIES" valgrind" @@ -39,8 +39,8 @@ export CMAKE_ADDITIONAL_OPTIONS=$CMAKE_ADDITIONAL_OPTIONS" -DBUILD_UNIT_TESTS=OF export CMAKE_ADDITIONAL_OPTIONS=$CMAKE_ADDITIONAL_OPTIONS" -DBUILD_PYTHON_INTERFACE=OFF" export CMAKE_ADDITIONAL_OPTIONS=$CMAKE_ADDITIONAL_OPTIONS" -DCMAKE_BUILD_TYPE=RELEASE" -export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/openrobots/lib/pkgconfig" -export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/openrobots/lib" +#export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/openrobots/lib/pkgconfig" +#export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/openrobots/lib" export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/ros/hydro/lib/pkgconfig" export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/ros/hydro/lib" -- GitLab