Merge branch 'conda-test' of github.com:johnwason/tesseract into dev/…

…conda-test
tesseract-robotics · Aug 29, 2023 · 768329e · 768329e
2 parents 146a625 + d21cb9b
commit 768329e
Showing 1 changed file with 93 additions and 69 deletions.
diff --git a/tesseract_geometry/cmake/Findassimp.cmake b/tesseract_geometry/cmake/Findassimp.cmake
@@ -1,89 +1,113 @@
 find_package(assimp QUIET CONFIG)
 
-if(NOT assimp_FOUND)
+if((NOT assimp_FOUND) OR (NOT TARGET assimp::assimp))
 
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(ASSIMP_ARCHITECTURE "64")
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  set(ASSIMP_ARCHITECTURE "32")
-endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(ASSIMP_ARCHITECTURE "64")
+  elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    set(ASSIMP_ARCHITECTURE "32")
+  endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
 
-if(MSVC)
-  find_package(PkgConfig REQUIRED)
-  # assimp is required, so REQUIRE the second attempt
-  pkg_check_modules(PC_ASSIMP REQUIRED assimp)
+  if(MSVC)
+    find_package(PkgConfig REQUIRED)
+    # assimp is required, so REQUIRE the second attempt
+    pkg_check_modules(PC_ASSIMP REQUIRED assimp)
 
-  if(MSVC_TOOLSET_VERSION)
-    set(ASSIMP_MSVC_VERSION "vc${MSVC_TOOLSET_VERSION}")
-  else(MSVC_TOOLSET_VERSION)
-    if(MSVC12)
-      set(ASSIMP_MSVC_VERSION "vc120")
-    elseif(MSVC14)
-      set(ASSIMP_MSVC_VERSION "vc140")
-    endif(MSVC12)
-  endif(MSVC_TOOLSET_VERSION)
+    if(MSVC_TOOLSET_VERSION)
+      set(ASSIMP_MSVC_VERSION "vc${MSVC_TOOLSET_VERSION}")
+    else(MSVC_TOOLSET_VERSION)
+      if(MSVC12)
+        set(ASSIMP_MSVC_VERSION "vc120")
+      elseif(MSVC14)
+        set(ASSIMP_MSVC_VERSION "vc140")
+      endif(MSVC12)
+    endif(MSVC_TOOLSET_VERSION)
 
-  # Find path of each library
-  find_path(assimp_INCLUDE_DIR NAMES assimp/anim.h HINTS ${PC_ASSIMP_INCLUDEDIR} REQUIRED)
-  find_path(
-    assimp_LIBRARY_DIR
-    NAMES assimp-${ASSIMP_MSVC_VERSION}-mt.lib
-          assimp-vc140-mt.lib
-          assimp-vc141-mt.lib
-          assimp-vc120-mt.lib
-    HINTS ${PC_ASSIMP_LIBDIR} "${PC_ASSIMP_PREFIX}/Lib" REQUIRED)
-  find_library(
-    assimp_LIBRARY
-    NAMES assimp-${ASSIMP_MSVC_VERSION}-mt.lib
-          assimp-vc140-mt.lib
-          assimp-vc141-mt.lib
-          assimp-vc120-mt.lib
-    PATHS ${assimp_LIBRARY_DIR} REQUIRED)
-else(MSVC)
+    # Find path of each library
+    find_path(assimp_INCLUDE_DIR NAMES assimp/anim.h HINTS ${PC_ASSIMP_INCLUDEDIR} REQUIRED)
+    find_path(
+      assimp_LIBRARY_DIR
+      NAMES assimp-${ASSIMP_MSVC_VERSION}-mt.lib
+            assimp-vc140-mt.lib
+            assimp-vc141-mt.lib
+            assimp-vc120-mt.lib
+      HINTS ${PC_ASSIMP_LIBDIR} "${PC_ASSIMP_PREFIX}/Lib" REQUIRED)
+    find_library(
+      assimp_LIBRARY
+      NAMES assimp-${ASSIMP_MSVC_VERSION}-mt.lib
+            assimp-vc140-mt.lib
+            assimp-vc141-mt.lib
+            assimp-vc120-mt.lib
+      PATHS ${assimp_LIBRARY_DIR} REQUIRED)
+  else(MSVC)
 
-  find_path(
-    assimp_INCLUDE_DIR
-    NAMES assimp/postprocess.h
-          assimp/scene.h
-          assimp/version.h
-          assimp/config.h
-          assimp/cimport.h
-    PATHS /usr/local/include
-    PATHS /usr/include/ REQUIRED)
+    find_path(
+      assimp_INCLUDE_DIR
+      NAMES assimp/postprocess.h
+            assimp/scene.h
+            assimp/version.h
+            assimp/config.h
+            assimp/cimport.h
+      PATHS /usr/local/include
+      PATHS /usr/include/ REQUIRED)
 
-  find_library(
-    assimp_LIBRARY
-    NAMES assimp
-    PATHS /usr/local/lib/
-    PATHS /usr/lib64/
-    PATHS /usr/lib/ REQUIRED)
-endif(MSVC)
+    find_library(
+      assimp_LIBRARY
+      NAMES assimp
+      PATHS /usr/local/lib/
+      PATHS /usr/lib64/
+      PATHS /usr/lib/ REQUIRED)
+  endif(MSVC)
 
-mark_as_advanced(assimp_INCLUDE_DIR assimp_LIBRARY assimp_LIBRARY_DIR)
+  mark_as_advanced(assimp_INCLUDE_DIR assimp_LIBRARY assimp_LIBRARY_DIR)
 
-# Output variables generation
-include(FindPackageHandleStandardArgs)
-if(MSVC)
-  find_package_handle_standard_args(assimp REQUIRED_VARS assimp_INCLUDE_DIR assimp_LIBRARY assimp_LIBRARY_DIR)
-else(MSVC)
-  find_package_handle_standard_args(assimp REQUIRED_VARS assimp_INCLUDE_DIR assimp_LIBRARY)
-endif(MSVC)
+  # Output variables generation
+  include(FindPackageHandleStandardArgs)
+  if(MSVC)
+    find_package_handle_standard_args(assimp REQUIRED_VARS assimp_INCLUDE_DIR assimp_LIBRARY assimp_LIBRARY_DIR)
+  else(MSVC)
+    find_package_handle_standard_args(assimp REQUIRED_VARS assimp_INCLUDE_DIR assimp_LIBRARY)
+  endif(MSVC)
 
-# Create assimp::assimp imported target
-add_library(assimp::assimp SHARED_IMPORTED)
-set_target_properties(assimp::assimp PROPERTIES
-  IMPORTED_LOCATION ${assimp_LIBRARY}
-  INTERFACE_INCLUDE_DIRECTORIES ${assimp_INCLUDE_DIR}
-  INTERFACE_LINK_LIBRARIES ${assimp_LIBRARY})
+  # Create assimp::assimp imported target
+  add_library(assimp::assimp SHARED IMPORTED)
+  set_target_properties(
+    assimp::assimp PROPERTIES IMPORTED_LOCATION ${assimp_LIBRARY} INTERFACE_INCLUDE_DIRECTORIES ${assimp_INCLUDE_DIR}
+                              INTERFACE_LINK_LIBRARIES ${assimp_LIBRARY})
 
 else()
-set(assimp_LIBRARY assimp::assimp)
+  set(assimp_LIBRARY assimp::assimp)
+endif()
+
+# workaround for https://github.com/assimp/assimp/issues/4474
+get_target_property(_assimp_TARGET_INCLUDE_DIRS assimp::assimp INTERFACE_INCLUDE_DIRECTORIES)
+foreach(_assimp_TARGET_INCLUDE_DIR ${_assimp_TARGET_INCLUDE_DIRS})
+  message(STATUS "_assimp_TARGET_INCLUDE_DIR ${_assimp_TARGET_INCLUDE_DIR}")
+  if(NOT EXISTS "${_assimp_TARGET_INCLUDE_DIR}")
+    # clear INTERFACE_INCLUDE_DIRECTORIES
+    find_path(
+      assimp_INCLUDE_DIR
+      NAMES assimp/postprocess.h
+            assimp/scene.h
+            assimp/version.h
+            assimp/config.h
+            assimp/cimport.h
+      PATHS /usr/local/include
+      PATHS /usr/include/ REQUIRED)
+    message(STATUS "Clearing assimp INTERFACE_INCLUDE_DIRECTORIES due to bug ${assimp_INCLUDE_DIR}")
+    set_property(TARGET assimp::assimp PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+  endif()
+endforeach()
+
+get_target_property(_assimp_IMPORTED_CONFIGURATIONS assimp::assimp INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(_assimp_IMPORTED_LOCATION_DEBUG assimp::assimp IMPORTED_LOCATION_DEBUG)
+if((NOT _assimp_IMPORTED_CONFIGURATIONS) OR (NOT _assimp_IMPORTED_LOCATION_DEBUG))
+  message(STATUS "Setting assimp IMPORTED_CONFIGURATIONS due to bug")
+  set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 endif()
 
 if(assimp_FOUND)
   set(assimp_INCLUDE_DIRS ${assimp_INCLUDE_DIR})
   set(assimp_LIBRARIES ${assimp_LIBRARY})
   set(assimp_LIBRARY_DIRS ${assimp_LIBRARY_DIR})
 endif()
-
-