bkinnightskytw
/
kdl_parser
mirror of https://github.com/existedinnettw/kdl_parser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

one more fix

This commit is contained in:
Ioan Sucan 2013-01-10 20:40:58 +02:00
parent 9df92c92aa
commit f7145f5c8f
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
collada_urdf/CMakeLists.txt
View File

@ -14,34 +14,28 @@ find_package(Boost REQUIRED COMPONENTS system)
include_directories(${Boost_INCLUDE_DIR}) include_directories(${Boost_INCLUDE_DIR})
find_package(assimp QUIET) find_package(assimp QUIET)
if ( NOT assimp_FOUND ) if ( NOT ASSIMP_FOUND )
find_package(Assimp QUIET) find_package(Assimp QUIET)
if ( Assimp_FOUND ) if ( NOT ASSIMP_FOUND )
set(assimp_FOUND ${Assimp_FOUND})
set(assimp_LIBRARIES ${Assimp_LIBRARIES})
set(assimp_LIBRARY_DIRS ${Assimp_LIBRARY_DIRS})
set(assimp_INCLUDE_DIRS ${Assimp_INCLUDE_DIRS})
set(assimp_VERSION ${Assimp_VERSION})
else()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(assimp assimp) pkg_check_modules(ASSIMP assimp)
endif() endif()
endif() endif()
if( assimp_FOUND ) if( ASSIMP_FOUND )
if( ${assimp_VERSION} STRGREATER "2.0.0" ) if( ${ASSIMP_VERSION} STRGREATER "2.0.0" )
set(IS_ASSIMP3 1) set(IS_ASSIMP3 1)
add_definitions(-DIS_ASSIMP3) add_definitions(-DIS_ASSIMP3)
endif() endif()
include_directories(${assimp_INCLUDE_DIRS}) include_directories(${ASSIMP_INCLUDE_DIRS})
link_directories(${assimp_LIBRARY_DIRS}) link_directories(${ASSIMP_LIBRARY_DIRS})
else() else()
message(STATUS "could not find assimp (perhaps available thorugh ROS package?), so assuming assimp v2") message(STATUS "could not find assimp (perhaps available thorugh ROS package?), so assuming assimp v2")
set(assimp_LIBRARIES assimp) set(ASSIMP_LIBRARIES assimp)
set(assimp_LIBRARY_DIRS) set(ASSIMP_LIBRARY_DIRS)
set(assimp_CXX_FLAGS) set(ASSIMP_CXX_FLAGS)
set(assimp_CFLAGS_OTHER) set(ASSIMP_CFLAGS_OTHER)
set(assimp_LINK_FLAGS) set(ASSIMP_LINK_FLAGS)
set(assimp_INCLUDE_DIRS) set(ASSIMP_INCLUDE_DIRS)
set(IS_ASSIMP3 0) # most likely not set(IS_ASSIMP3 0) # most likely not
endif() endif()
@ -57,10 +51,10 @@ include_directories(${catkin_INCLUDE_DIRS})
link_directories(${catkin_LIBRARY_DIRS}) link_directories(${catkin_LIBRARY_DIRS})
add_library(${PROJECT_NAME} src/collada_urdf.cpp) add_library(${PROJECT_NAME} src/collada_urdf.cpp)
target_link_libraries(${PROJECT_NAME} ${tinyxml_library} ${assimp_LIBRARIES} ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES} target_link_libraries(${PROJECT_NAME} ${tinyxml_library} ${ASSIMP_LIBRARIES} ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES}
${Boost_LIBRARIES}) ${Boost_LIBRARIES})
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILER_FLAGS "${assimp_CXX_FLAGS} ${assimp_CFLAGS_OTHER}") set_target_properties(${PROJECT_NAME} PROPERTIES COMPILER_FLAGS "${ASSIMP_CXX_FLAGS} ${ASSIMP_CFLAGS_OTHER}")
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "${assimp_LINK_FLAGS}") set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "${ASSIMP_LINK_FLAGS}")
add_executable(urdf_to_collada src/urdf_to_collada.cpp) add_executable(urdf_to_collada src/urdf_to_collada.cpp)
target_link_libraries(urdf_to_collada ${PROJECT_NAME}) target_link_libraries(urdf_to_collada ${PROJECT_NAME})