From 85b20197671e142044e471df603debd0faf08baf Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Sun, 26 Jan 2014 02:05:24 -0700
Subject: [PATCH] Better feature detection for assimp version

The unified headers were introduced in Assimp 2.0.1150, so checking for Assimp 3.0.0 is not quite the best solution.

See https://github.com/assimp/assimp/commit/6fa251c2f2e7a142bb861227dce0c26362927fbc
---
 collada_urdf/CMakeLists.txt       | 6 ++----
 collada_urdf/src/collada_urdf.cpp | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
index 05217be..54a1e05 100644
--- a/collada_urdf/CMakeLists.txt
+++ b/collada_urdf/CMakeLists.txt
@@ -24,9 +24,8 @@ if ( NOT ASSIMP_FOUND )
   endif()
 endif()
 if( ASSIMP_FOUND )
-  if( ${ASSIMP_VERSION} STRGREATER "2.0.0" )
-    set(IS_ASSIMP3 1)
-    add_definitions(-DIS_ASSIMP3)
+  if( ${ASSIMP_VERSION} STRGREATER "2.0.1150" )
+    add_definitions(-DASSIMP_UNIFIED_HEADER_NAMES)
   endif()
   include_directories(${ASSIMP_INCLUDE_DIRS})
   link_directories(${ASSIMP_LIBRARY_DIRS})
@@ -38,7 +37,6 @@ else()
   set(ASSIMP_CFLAGS_OTHER)
   set(ASSIMP_LINK_FLAGS)
   set(ASSIMP_INCLUDE_DIRS)
-  set(IS_ASSIMP3 0) # most likely not
 endif()
 
 find_package(COLLADA_DOM 2.3 COMPONENTS 1.5)
diff --git a/collada_urdf/src/collada_urdf.cpp b/collada_urdf/src/collada_urdf.cpp
index 7301049..aae003d 100644
--- a/collada_urdf/src/collada_urdf.cpp
+++ b/collada_urdf/src/collada_urdf.cpp
@@ -62,7 +62,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 
-#if defined(IS_ASSIMP3)
+#if defined(ASSIMP_UNIFIED_HEADER_NAMES)
 #include <assimp/scene.h>
 #include <assimp/LogStream.hpp>
 #include <assimp/DefaultLogger.hpp>