Implement heuristic to resolve import/shared libraries on Windows

Author: theblackunknown

cmake/modules/FindTBB.cmake

@@ -250,6 +250,36 @@ if(NOT TBB_FOUND)
           PATHS ${TBB_DEFAULT_SEARCH_DIR} ENV LIBRARY_PATH
           PATH_SUFFIXES ${TBB_LIB_PATH_SUFFIX})
 
+      # On Windows platforms also looks for .dll binaries.
+      # If we find some, assume TBB is built as a shared library with the .lib/.dll pair,
+      # otherwise assume it is built as a static library
+      set(TBB_${_comp}_TARGET_TYPE SHARED)
+      if(WIN32)
+        find_library(TBB_${_comp}_SHARED_LIBRARY_RELEASE
+            NAMES ${_lib_name}${CMAKE_SHARED_LIBRARY_SUFFIX}
+            HINTS ${TBB_LIBRARY} ${TBB_SEARCH_DIR}
+            PATHS ${TBB_DEFAULT_SEARCH_DIR} ENV LIBRARY_PATH
+            PATH_SUFFIXES
+              "bin" ${TBB_LIB_PATH_SUFFIX}
+        )
+        
+        find_library(TBB_${_comp}_SHARED_LIBRARY_RELEASE
+            NAMES ${_lib_name}${CMAKE_SHARED_LIBRARY_SUFFIX}
+            HINTS ${TBB_LIBRARY} ${TBB_SEARCH_DIR}
+            PATHS ${TBB_DEFAULT_SEARCH_DIR} ENV LIBRARY_PATH
+            PATH_SUFFIXES
+              "bin" ${TBB_LIB_PATH_SUFFIX}
+        )
+      
+        if(TBB_${_comp}_LIBRARY_RELEASE AND TBB_${_comp}_SHARED_LIBRARY_RELEASE)
+          set(TBB_${_comp}_TARGET_TYPE SHARED)
+        elseif(TBB_${_comp}_LIBRARY_DEBUG AND TBB_${_comp}_SHARED_LIBRARY_DEBUG)
+          set(TBB_${_comp}_TARGET_TYPE SHARED)
+        else()
+          set(TBB_${_comp}_TARGET_TYPE STATIC)
+        endif()
+      endif()
+
       if(TBB_${_comp}_LIBRARY_DEBUG)
         list(APPEND TBB_LIBRARIES_DEBUG "${TBB_${_comp}_LIBRARY_DEBUG}")
       endif()
@@ -270,6 +300,7 @@ if(NOT TBB_FOUND)
       mark_as_advanced(TBB_${_comp}_LIBRARY_RELEASE)
       mark_as_advanced(TBB_${_comp}_LIBRARY_DEBUG)
       mark_as_advanced(TBB_${_comp}_LIBRARY)
+      mark_as_advanced(TBB_${_comp}_TARGET_TYPE)
 
     endif()
   endforeach()
@@ -302,26 +333,52 @@ if(NOT TBB_FOUND)
   ##################################
 
   if(NOT CMAKE_VERSION VERSION_LESS 3.0 AND TBB_FOUND)
-    add_library(TBB::tbb SHARED IMPORTED)
-    set_target_properties(TBB::tbb PROPERTIES
-          INTERFACE_INCLUDE_DIRECTORIES  ${TBB_INCLUDE_DIRS}
-          IMPORTED_LOCATION              ${TBB_LIBRARIES})
-    if(TBB_LIBRARIES_RELEASE AND TBB_LIBRARIES_DEBUG)
-      set_target_properties(TBB::tbb PROPERTIES
-          INTERFACE_COMPILE_DEFINITIONS "$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:TBB_USE_DEBUG=1>"
-          IMPORTED_LOCATION_DEBUG          ${TBB_LIBRARIES_DEBUG}
-          IMPORTED_LOCATION_RELWITHDEBINFO ${TBB_LIBRARIES_DEBUG}
-          IMPORTED_LOCATION_RELEASE        ${TBB_LIBRARIES_RELEASE}
-          IMPORTED_LOCATION_MINSIZEREL     ${TBB_LIBRARIES_RELEASE}
-          )
-    elseif(TBB_LIBRARIES_RELEASE)
-      set_target_properties(TBB::tbb PROPERTIES IMPORTED_LOCATION ${TBB_LIBRARIES_RELEASE})
-    else()
-      set_target_properties(TBB::tbb PROPERTIES
-          INTERFACE_COMPILE_DEFINITIONS "${TBB_DEFINITIONS_DEBUG}"
-          IMPORTED_LOCATION              ${TBB_LIBRARIES_DEBUG}
-          )
-    endif()
+
+    foreach(_comp ${TBB_SEARCH_COMPONENTS})
+      if(";${TBB_FIND_COMPONENTS};tbb" MATCHES ";${_comp};")
+
+        add_library(TBB::${_comp} ${TBB_${_comp}_TARGET_TYPE} IMPORTED)
+        set_property(TARGET TBB::${_comp} APPEND PROPERTY
+            INTERFACE_INCLUDE_DIRECTORIES ${TBB_INCLUDE_DIRS}
+        )
+
+        if(TBB_${_comp}_LIBRARY_DEBUG)
+          set_property(TARGET TBB::${_comp} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+          set_property(TARGET TBB::${_comp} APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:TBB_USE_DEBUG=1>")
+
+          if(WIN32 AND TBB_${_comp}_SHARED_LIBRARY_DEBUG)
+            set_target_properties(TBB::${_comp} PROPERTIES
+                IMPORTED_IMPLIB_LOCATION_DEBUG          ${TBB_${_comp}_LIBRARY_DEBUG}
+                IMPORTED_IMPLIB_LOCATION_RELWITHDEBINFO ${TBB_${_comp}_LIBRARY_DEBUG}
+
+                IMPORTED_LOCATION_DEBUG                 ${TBB_${_comp}_SHARED_LIBRARY_DEBUG}
+                IMPORTED_LOCATION_RELWITHDEBINFO        ${TBB_${_comp}_SHARED_LIBRARY_DEBUG})
+          else()
+            set_target_properties(TBB::${_comp} PROPERTIES
+                IMPORTED_LOCATION_DEBUG                 ${TBB_${_comp}_LIBRARY_DEBUG}
+                IMPORTED_LOCATION_RELWITHDEBINFO        ${TBB_${_comp}_LIBRARY_DEBUG})
+          endif()
+        endif()
+
+        if(TBB_${_comp}_LIBRARY_RELEASE)
+          set_property(TARGET TBB::${_comp} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+
+          if(WIN32 AND TBB_${_comp}_SHARED_LIBRARY_RELEASE)
+            set_target_properties(TBB::${_comp} PROPERTIES
+                IMPORTED_IMPLIB_LOCATION_RELEASE    ${TBB_${_comp}_LIBRARY_RELEASE}
+                IMPORTED_IMPLIB_LOCATION_MINSIZEREL ${TBB_${_comp}_LIBRARY_RELEASE}
+
+                IMPORTED_LOCATION_RELEASE           ${TBB_${_comp}_SHARED_LIBRARY_RELEASE}
+                IMPORTED_LOCATION_MINSIZEREL        ${TBB_${_comp}_SHARED_LIBRARY_RELEASE})
+          else()
+            set_target_properties(TBB::${_comp} PROPERTIES
+                IMPORTED_LOCATION_RELEASE           ${TBB_${_comp}_LIBRARY_RELEASE}
+                IMPORTED_LOCATION_MINSIZEREL        ${TBB_${_comp}_LIBRARY_RELEASE})
+          endif()
+        endif()
+
+      endif()
+    endforeach()
   endif()
 
   mark_as_advanced(TBB_INCLUDE_DIRS TBB_LIBRARIES)