From 2d39cb20f09c2f2dd1cb6abbe228b0756c2a7e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Chr=C3=A9tien?= Date: Fri, 23 May 2014 10:43:14 +0200 Subject: [PATCH] Fix clash with assimp 3.1 in CMake. --- collada_urdf/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt index fc93e4c..524f2e9 100644 --- a/collada_urdf/CMakeLists.txt +++ b/collada_urdf/CMakeLists.txt @@ -12,9 +12,6 @@ catkin_package( include_directories(include) -find_package(Boost REQUIRED COMPONENTS system filesystem program_options) -include_directories(${Boost_INCLUDE_DIR}) - find_package(assimp QUIET) if ( NOT ASSIMP_FOUND ) find_package(Assimp QUIET) @@ -42,6 +39,11 @@ else() set(ASSIMP_INCLUDE_DIRS) 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) if( COLLADA_DOM_FOUND ) include_directories(${COLLADA_DOM_INCLUDE_DIRS})