Cleanup linking

CMake/Utils.cmake

@@ -38,27 +38,53 @@ function(bigfoot_create_bigfile ParentFolder)
     )
 endfunction()
 
-function(bigfoot_compile_flatbuffers BigfootDependencies)
-    set(IncludeFolders "")
+function(_bigfoot_collect_includes_recursive Target UseAllLinks)
+    get_property(_Visited GLOBAL PROPERTY _BIGFOOT_VISITED_TARGETS)
+    if("${Target}" IN_LIST _Visited)
+        return()
+    endif()
+    set_property(GLOBAL APPEND PROPERTY _BIGFOOT_VISITED_TARGETS "${Target}")
 
-    list(APPEND IncludeFolders ${CMAKE_CURRENT_SOURCE_DIR}/Include)
-
-    foreach(Dependency IN LISTS BigfootDependencies)
-        if(TARGET ${Dependency})
-            get_target_property(DependencyIncludeDirs ${Dependency} INTERFACE_INCLUDE_DIRECTORIES)
-            if(DependencyIncludeDirs)
-                foreach(Dir IN LISTS DependencyIncludeDirs)
-                    # Strip $<BUILD_INTERFACE:...> generator expression
-                    if(Dir MATCHES "^\\$<BUILD_INTERFACE:(.+)>$")
-                        list(APPEND IncludeFolders "${CMAKE_MATCH_1}")
-                    elseif(NOT Dir MATCHES "^\\$<")
-                        # Pass through plain paths, skip other generator expressions
-                        list(APPEND IncludeFolders "${Dir}")
-                    endif()
-                endforeach()
+    get_target_property(_IncDirs "${Target}" INTERFACE_INCLUDE_DIRECTORIES)
+    if(_IncDirs)
+        foreach(_Dir IN LISTS _IncDirs)
+            if(_Dir MATCHES "^\\$<BUILD_INTERFACE:(.+)>$")
+                set_property(GLOBAL APPEND PROPERTY _BIGFOOT_INCLUDE_DIRS "${CMAKE_MATCH_1}")
+            elseif(NOT _Dir MATCHES "^\\$<")
+                set_property(GLOBAL APPEND PROPERTY _BIGFOOT_INCLUDE_DIRS "${_Dir}")
             endif()
+        endforeach()
+    endif()
+
+    if(UseAllLinks)
+        get_target_property(_Libs "${Target}" LINK_LIBRARIES)
+    else()
+        get_target_property(_Libs "${Target}" INTERFACE_LINK_LIBRARIES)
+    endif()
+    if(NOT _Libs)
+        return()
+    endif()
+    foreach(_Lib IN LISTS _Libs)
+        if(_Lib MATCHES "^\\$<LINK_LIBRARY:[^,]+,(.+)>$")
+            foreach(_Inner IN LISTS CMAKE_MATCH_1)
+                if(TARGET "${_Inner}")
+                    _bigfoot_collect_includes_recursive("${_Inner}" FALSE)
+                endif()
+            endforeach()
+        elseif(NOT _Lib MATCHES "^\\$<" AND TARGET "${_Lib}")
+            _bigfoot_collect_includes_recursive("${_Lib}" FALSE)
         endif()
     endforeach()
+endfunction()
+
+function(bigfoot_compile_flatbuffers)
+    set_property(GLOBAL PROPERTY _BIGFOOT_VISITED_TARGETS "")
+    set_property(GLOBAL PROPERTY _BIGFOOT_INCLUDE_DIRS "")
+    _bigfoot_collect_includes_recursive(${PROJECT_NAME} TRUE)
+
+    get_property(_CollectedDirs GLOBAL PROPERTY _BIGFOOT_INCLUDE_DIRS)
+    set(IncludeFolders "${CMAKE_CURRENT_SOURCE_DIR}/Include" ${_CollectedDirs})
+    list(REMOVE_DUPLICATES IncludeFolders)
 
     set(IncludeFlags "")
     foreach(folder IN LISTS IncludeFolders)