Skip to content

Commit

Permalink
Merge pull request ekumenlabs#52 from Intermodalics/remove-unneeded-p…
Browse files Browse the repository at this point in the history
…atches

Remove or comment out unneeded patches
  • Loading branch information
meyerj authored Dec 3, 2018
2 parents 24c3136 + e2dc839 commit 174f5e7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
12 changes: 0 additions & 12 deletions build_library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,3 @@ echo -e '\e[34mBuilding '$1.'\e[39m'
echo

cmake_build $2

if [ $1 == 'eigen' ]; then
cp -r $CMAKE_PREFIX_PATH/include/eigen3/* $CMAKE_PREFIX_PATH/include
fi

# TODO(ivanpauno): Check this later.
# if [ $1 == 'opencv' ]; then
# echo "Copy opencv 3rdparty libraries to the lib folder."
# echo "These are needed to build the compressed image transport plugin."
# (cp $2/build/3rdparty/lib/* $2/../../target/lib/)
# fi

2 changes: 1 addition & 1 deletion do_everything.sh
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ echo

# Library path is incorrect for urdf.
# TODO: Need to investigate the source of the issue
sed -i 's/set(libraries "urdf;/set(libraries "/g' $CMAKE_PREFIX_PATH/share/urdf/cmake/urdfConfig.cmake
#sed -i 's/set(libraries "urdf;/set(libraries "/g' $CMAKE_PREFIX_PATH/share/urdf/cmake/urdfConfig.cmake

run_cmd create_android_mk $prefix/catkin_ws/src $prefix/roscpp_android_ndk

Expand Down

0 comments on commit 174f5e7

Please sign in to comment.