(euscollada) update for assimp_devel in jsk_common (jsk-ros-pkg#20)

k-okada · Apr 17, 2014 · 76e9635 · 76e9635
1 parent e41717e
commit 76e9635
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/euscollada/catkin.cmake b/euscollada/catkin.cmake
@@ -4,23 +4,26 @@ project(euscollada)
 
 catkin_package()
 
-find_package(catkin REQUIRED COMPONENTS collada_urdf rospack assimp_devel collada_parser urdfdom resource_retriever)
+find_package(catkin REQUIRED COMPONENTS collada_urdf rospack collada_parser urdfdom resource_retriever)
+
+set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CATKIN_DEVEL_PREFIX}/lib/pkgconfig")
 
 find_package(PkgConfig)
 pkg_check_modules(colladadom collada-dom-150 REQUIRED)
 pkg_check_modules(yaml_cpp yaml-cpp REQUIRED)
-include_directories(${catkin_INCLUDE_DIRS} ${colladadom_INCLUDE_DIRS} ${yaml_cpp_INCLUDE_DIRS})
-link_directories(${catkin_LIBRARY_DIRS})
+pkg_check_modules(assimpdevel assimp_devel REQUIRED)
+include_directories(${catkin_INCLUDE_DIRS} ${colladadom_INCLUDE_DIRS} ${yaml_cpp_INCLUDE_DIRS} ${assimpdevel_INCLUDE_DIRS})
+link_directories(${catkin_LIBRARY_DIRS} ${assimpdevel_LIBRARY_DIRS})
 
 add_executable(collada2eus src/collada2eus.cpp)
 target_link_libraries(collada2eus ${catkin_LIBRARIES} qhull ${yaml_cpp_LIBRARIES} ${colladadom_LIBRARIES} ${recource_retriever_LIBRARIES})
-add_dependencies(collada2eus libassimp)
+add_dependencies(collada2eus libassimp_devel)
 
 find_package(Boost REQUIRED system)
 include_directories(${Boost_INCLUDE_DIR})
 add_executable(collada2eus_urdfmodel src/collada2eus_urdfmodel.cpp)
-target_link_libraries(collada2eus_urdfmodel ${catkin_LIBRARIES} qhull ${yaml_cpp_LIBRARIES} ${colladadom_LIBRARIES} ${collada_parser_LIBRARIES} ${recource_retriever_LIBRARIES} ${assimp_devel_LIBRARIES} ${Boost_LIBRARIES})
-add_dependencies(collada2eus_urdfmodel libassimp)
+target_link_libraries(collada2eus_urdfmodel ${catkin_LIBRARIES} qhull ${yaml_cpp_LIBRARIES} ${colladadom_LIBRARIES} ${collada_parser_LIBRARIES} ${recource_retriever_LIBRARIES} ${assimpdevel_LIBRARIES} ${Boost_LIBRARIES})
+add_dependencies(collada2eus_urdfmodel libassimp_devel)
 
 install(TARGETS collada2eus collada2eus_urdfmodel
         RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}

diff --git a/euscollada/src/collada2eus_urdfmodel.cpp b/euscollada/src/collada2eus_urdfmodel.cpp
@@ -7,12 +7,12 @@
 #include <sys/utsname.h>
 #include <math.h>
 
-// assimp 3 (assimp_devel)
-#include <assimp/Importer.hpp>
-#include <assimp/scene.h>
-#include <assimp/postprocess.h>
-#include <assimp/IOStream.hpp>
-#include <assimp/IOSystem.hpp>
+// assimp_devel
+#include <Importer.hpp>
+#include <scene.h>
+#include <postprocess.h>
+#include <IOStream.hpp>
+#include <IOSystem.hpp>
 
 #include <iostream>
 #include <fstream>