Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update collada_urdf to use assimp_devel on hydro-devel #386

Merged
merged 2 commits into from
Apr 17, 2014

Conversation

k-okada
Copy link
Member

@k-okada k-okada commented Apr 14, 2014

from jsk-ros-pkg/jsk_model_tools#20, collada_tools is basically collada_urdf linked with asssimp_devel, here is the PR to do that

this requires following patch on assimp_devel

diff --git a/assimp_devel/Makefile b/assimp_devel/Makefile
index 93cf0ab..e17c5fe 100644
--- a/assimp_devel/Makefile
+++ b/assimp_devel/Makefile
@@ -22,6 +22,8 @@ CPU_NUM=$(shell grep -c processor /proc/cpuinfo)
 PARALLEL_JOB=$(shell if `expr $(CPU_NUM) \> 12 > /dev/null`;then echo 12; else echo ${CPU_NUM}; fi)
 assimp_devel: $(GIT_DIR) patched
        cd $(GIT_DIR) && mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && BOOST_INCLUDEDIR=$(BOOST_INCLUDE_DIRS) BOOST_LIBRARYDIR=$(BOOST_LIBRARY_DIRS) cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR) -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) .. && make -j$(PARALLEL_JOB) install
+ if [ -e $(INSTALL_DIR)/lib/pkgconfig/assimp.pc ]; then mv $(INSTALL_DIR)/lib/pkgconfig/assimp.pc $(INSTALL_DIR)/lib/pkgconfig/assimp_devel.pc ; fi
+ sed -i s@include/assimp@include@g $(INSTALL_DIR)/lib/pkgconfig/assimp_devel.pc
 #      if [ -e $(INSTALL_DIR)/include/assimp3 ]; then rm -rf $(INSTALL_DIR)/include/assimp3; fi
 #      mv $(INSTALL_DIR)/include/assimp $(INSTALL_DIR)/include/assimp3
 #      mv $(INSTALL_DIR)/bin/assimp $(INSTALL_DIR)/bin/assimp_cmd

@k-okada
Copy link
Member Author

k-okada commented Apr 14, 2014

I didn't test this code, so please confirm this @YoheiKakiuchi
Currently, this program links to both assimp2 and assimp3, It seems not good.

$ ldd build/robot_model/devel/lib/collada_urdf/urdf_to_collada  |grep ass
    libclass_loader.so => /opt/ros/groovy/lib/libclass_loader.so (0x00007fc1970f5000)
    libassimp.so.3 => /home/k-okada/ros/groovy/jsk-ros-pkg/jsk_model_tools/assimp_devel/lib/libassimp.so.3 (0x00007fc1951ba000)
    libassimp.so.2 => /usr/lib/libassimp.so.2 (0x00007fc19379c000)

@k-okada
Copy link
Member Author

k-okada commented Apr 15, 2014

from discussion here, jsk-ros-pkg/jsk_model_tools#20, collada_tools is hydro-devel of collada_urdf with assimp_devel library. update collada_urdf_jsk_patch.

this patch depends on #387

@k-okada k-okada mentioned this pull request Apr 16, 2014
k-okada added a commit that referenced this pull request Apr 17, 2014
update collada_urdf to use assimp_devel on hydro-devel
@k-okada k-okada merged commit e1b8404 into jsk-ros-pkg:master Apr 17, 2014
@k-okada k-okada deleted the assimp_collada_urdf branch April 17, 2014 03:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant