Fix support for assimp 5.1.0 (#826)

ros2 · Feb 22, 2022 · 1211b17 · 1211b17
1 parent 9816bea
commit 1211b17
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/rviz_assimp_vendor/rviz_assimp_vendor-extras.cmake.in b/rviz_assimp_vendor/rviz_assimp_vendor-extras.cmake.in
@@ -19,15 +19,20 @@ find_package(assimp REQUIRED QUIET)
 string(REPLACE "/lib/lib/" "/lib/" ASSIMP_LIBRARY_DIRS "${ASSIMP_LIBRARY_DIRS}")
 string(REGEX REPLACE "/lib/include$" "/include" ASSIMP_INCLUDE_DIRS "${ASSIMP_INCLUDE_DIRS}")
 
-set(rviz_assimp_vendor_LIBRARIES)
-foreach(library IN LISTS ASSIMP_LIBRARIES)
-  message(STATUS "library: ${library}")
-  if(IS_ABSOLUTE "${library}")
-    list(APPEND rviz_assimp_vendor_LIBRARIES "${library}")
-  else()
-    find_library(library_abs ${library} PATHS "${ASSIMP_LIBRARY_DIRS}" NO_DEFAULT_PATH)
-    list(APPEND rviz_assimp_vendor_LIBRARIES "${library_abs}")
-  endif()
-endforeach()
+# Fix for https://github.com/ros2/ros2/issues/1222
+if(TARGET assimp::assimp AND "${assimp_VERSION}" VERSION_GREATER 5.0.1)
+  set(rviz_assimp_vendor_LIBRARIES assimp::assimp)
+else()
+  set(rviz_assimp_vendor_LIBRARIES)
+  foreach(library IN LISTS ASSIMP_LIBRARIES)
+    message(STATUS "library: ${library}")
+    if(IS_ABSOLUTE "${library}")
+      list(APPEND rviz_assimp_vendor_LIBRARIES "${library}")
+    else()
+      find_library(library_abs ${library} PATHS "${ASSIMP_LIBRARY_DIRS}" NO_DEFAULT_PATH)
+      list(APPEND rviz_assimp_vendor_LIBRARIES "${library_abs}")
+    endif()
+  endforeach()
+endif()
 set(rviz_assimp_vendor_LIBRARY_DIRS ${ASSIMP_LIBRARY_DIRS})
 set(rviz_assimp_vendor_INCLUDE_DIRS ${ASSIMP_INCLUDE_DIRS})
diff --git a/rviz_rendering/CMakeLists.txt b/rviz_rendering/CMakeLists.txt
@@ -121,6 +121,7 @@ ament_target_dependencies(rviz_rendering
 )
 ament_export_dependencies(
   rviz_ogre_vendor
+  rviz_assimp_vendor
   eigen3_cmake_module
   Eigen3
   resource_retriever