tabulate: allow partial include

single_include takes priority if file of the same name exist in both directories in the source Signed-off-by: giskard <[email protected]>
mesonbuild · Sep 3, 2022 · 8bb8925 · 8bb8925
1 parent caa2482
commit 8bb8925
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/releases.json b/releases.json
@@ -1844,6 +1844,7 @@
       "tabulate"
     ],
     "versions": [
+      "1.4-2",
       "1.4-1"
     ]
   },

diff --git a/subprojects/packagefiles/tabulate/meson.build b/subprojects/packagefiles/tabulate/meson.build
@@ -5,12 +5,32 @@ project(
     license : 'MIT'
 )
 
-install_headers([
-    'single_include/tabulate/tabulate.hpp',
-], subdir: 'tabulate')
-
-includes = include_directories(['single_include'])
+includes = include_directories(['single_include', 'include'])
 
 tabulate_dep = declare_dependency(
     include_directories: includes
 )
+
+install_headers([
+    'include/tabulate/asciidoc_exporter.hpp',
+    'include/tabulate/cell.hpp',
+    'include/tabulate/color.hpp',
+    'include/tabulate/column.hpp',
+    'include/tabulate/column_format.hpp',
+    'include/tabulate/exporter.hpp',
+    'include/tabulate/font_align.hpp',
+    'include/tabulate/font_style.hpp',
+    'include/tabulate/format.hpp',
+    'include/tabulate/latex_exporter.hpp',
+    'include/tabulate/markdown_exporter.hpp',
+    'include/tabulate/optional_lite.hpp',
+    'include/tabulate/printer.hpp',
+    'include/tabulate/row.hpp',
+    'include/tabulate/table.hpp',
+    'include/tabulate/table_internal.hpp',
+    'include/tabulate/termcolor.hpp',
+    'include/tabulate/utf8.hpp',
+    'include/tabulate/variant_lite.hpp',
+
+    'single_include/tabulate/tabulate.hpp',
+], subdir: 'tabulate')
-Original file line number
+Diff line change
@@ Expand Up / @@ -1844,6 +1844,7 @@ @@
           "tabulate"
         ],
         "versions": [
+          "1.4-2",
           "1.4-1"
         ]
       },
@@ Expand Down @@