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

Merge pull request #75 from bchretien/indigo-devel 

Fix clash with assimp 3.1 in CMake.
This commit is contained in:
Ioan A Sucan 2014-07-07 08:40:23 -07:00
parent f9daf957c4 2d39cb20f0
commit ee41949d7b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
collada_urdf/CMakeLists.txt
View File

@ -12,9 +12,6 @@ catkin_package(
include_directories(include) include_directories(include)
find_package(Boost REQUIRED COMPONENTS system filesystem program_options)
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)
@ -42,6 +39,11 @@ else()
set(ASSIMP_INCLUDE_DIRS) set(ASSIMP_INCLUDE_DIRS)
endif() endif()
# Note: assimp 3.1 overwrites CMake Boost variables, so we need to check for
# Boost after assimp.
find_package(Boost REQUIRED COMPONENTS system filesystem program_options)
include_directories(${Boost_INCLUDE_DIR})
find_package(COLLADA_DOM 2.3 COMPONENTS 1.5) find_package(COLLADA_DOM 2.3 COMPONENTS 1.5)
if( COLLADA_DOM_FOUND ) if( COLLADA_DOM_FOUND )
include_directories(${COLLADA_DOM_INCLUDE_DIRS}) include_directories(${COLLADA_DOM_INCLUDE_DIRS})