Ensure natvis files in the extra/ directory are added to the target's INTERFACE_SOURCES

Author: k3DW

include/BoostInstall.cmake

@@ -214,12 +214,37 @@ function(__boost_install_update_include_directory lib incdir prop)
 
 endfunction()
 
+function(__boost_install_update_natvis lib extradir)
+
+  if(lib MATCHES "^boost_(.*)$" AND TARGET "${lib}")
+
+    file(GLOB files "${extradir}/*.natvis")
+
+    # Extract the library name as the component of the path, one up from the header directory
+    get_filename_component(LIBRARY_NAME "${extradir}" DIRECTORY)
+    get_filename_component(LIBRARY_NAME "${LIBRARY_NAME}" NAME)
+
+    foreach(file IN LISTS files)
+
+      get_filename_component(file "${file}" NAME)
+
+      target_sources("${lib}" INTERFACE
+        $<BUILD_INTERFACE:${extradir}/${file}>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_DATADIR}/boost/${LIBRARY_NAME}/${file}>
+      )
+
+    endforeach()
+
+  endif()
+
+endfunction()
+
 # Installs a single target
-# boost_install_target(TARGET target VERSION version [HEADER_DIRECTORY directory])
+# boost_install_target(TARGET target VERSION version [HEADER_DIRECTORY directory] [EXTRA_DIRECTORY directory])
 
 function(boost_install_target)
 
-  cmake_parse_arguments(_ "" "TARGET;VERSION;HEADER_DIRECTORY" "" ${ARGN})
+  cmake_parse_arguments(_ "" "TARGET;VERSION;HEADER_DIRECTORY;EXTRA_DIRECTORY" "" ${ARGN})
 
   if(NOT __TARGET)
 
@@ -316,6 +341,10 @@ function(boost_install_target)
     if(TYPE STREQUAL "STATIC_LIBRARY" AND NOT CMAKE_VERSION VERSION_LESS 3.15)
       install(FILES "$<TARGET_FILE_DIR:${LIB}>/$<TARGET_FILE_PREFIX:${LIB}>$<TARGET_FILE_BASE_NAME:${LIB}>.pdb" DESTINATION ${CMAKE_INSTALL_LIBDIR} OPTIONAL)
     endif()
+
+    if(__EXTRA_DIRECTORY)
+      __boost_install_update_natvis(${LIB} ${__EXTRA_DIRECTORY})
+    endif()
   endif()
 
   install(EXPORT ${LIB}-targets DESTINATION "${CONFIG_INSTALL_DIR}" NAMESPACE Boost:: FILE ${LIB}-targets.cmake)
@@ -557,7 +586,7 @@ function(boost_install)
 
   foreach(target IN LISTS __TARGETS)
 
-    boost_install_target(TARGET ${target} VERSION ${__VERSION} HEADER_DIRECTORY ${__HEADER_DIRECTORY})
+    boost_install_target(TARGET ${target} VERSION ${__VERSION} HEADER_DIRECTORY ${__HEADER_DIRECTORY} EXTRA_DIRECTORY ${EXTRA_DIRECTORY})
 
   endforeach()