Meson build: Add install_tag keyword argument

kjellahl · kjellahl · commit a831266380ec · 2025-02-12T19:24:58.000+01:00
diff --git a/docs/manual/meson.build b/docs/manual/meson.build
@@ -72,7 +72,8 @@ custom_target('manual_html',
   ],
   build_by_default: true,
   install: true,
-  install_dir: install_tutorialdir
+  install_dir: install_tutorialdir,
+  install_tag: 'doc',
 )
 
 if can_parse_and_validate
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
@@ -104,6 +104,7 @@ tag_file = custom_target('html_and_tag',
   build_by_default: build_documentation,
   install: true,
   install_dir: install_reference_docdir,
+  install_tag: 'doc',
 )
 
 devhelp_file = custom_target('devhelp',
@@ -127,7 +128,8 @@ meson.add_install_script(
   devhelp_file.full_path(),
   install_devhelpdir,
   install_reference_docdir / 'html',
-  docinstall_flags
+  docinstall_flags,
+  install_tag: 'doc',
 )
 
 # Distribute built files and files copied by mm-common-get.
diff --git a/examples/meson.build b/examples/meson.build
@@ -39,7 +39,8 @@ foreach ex : example_programs
   exe_file = executable(ex_name, ex_sources,
     dependencies: xmlxx_own_dep,
     implicit_include_directories: false,
-    build_by_default: build_examples
+    build_by_default: build_examples,
+    install: false,
   )
 
   if build_examples
diff --git a/meson.build b/meson.build
@@ -364,7 +364,9 @@ configure_file(
   input: xmlxxconfig_h_meson,
   output: 'libxml++config.h',
   configuration: pkg_conf_data,
+  install: true,
   install_dir: install_includeconfigdir,
+  install_tag: 'devel',
 )
 
 subdir('MSVC_NMake/libxml++')
diff --git a/tests/meson.build b/tests/meson.build
@@ -25,7 +25,8 @@ foreach ex : test_programs
   exe_file = executable(ex_name, ex_sources,
     dependencies: xmlxx_own_dep,
     implicit_include_directories: false,
-    build_by_default: build_tests
+    build_by_default: build_tests,
+    install: false,
   )
 
   if build_tests

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ custom_target('manual_html',`
`72`	`72`	`],`
`73`	`73`	`build_by_default: true,`
`74`	`74`	`install: true,`
`75`		`- install_dir: install_tutorialdir`
	`75`	`+ install_dir: install_tutorialdir,`
	`76`	`+ install_tag: 'doc',`
`76`	`77`	`)`
`77`	`78`
`78`	`79`	`if can_parse_and_validate`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ foreach ex : example_programs`
`39`	`39`	`exe_file = executable(ex_name, ex_sources,`
`40`	`40`	`dependencies: xmlxx_own_dep,`
`41`	`41`	`implicit_include_directories: false,`
`42`		`- build_by_default: build_examples`
	`42`	`+ build_by_default: build_examples,`
	`43`	`+ install: false,`
`43`	`44`	`)`
`44`	`45`
`45`	`46`	`if build_examples`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,9 @@ configure_file(`
`364`	`364`	`input: xmlxxconfig_h_meson,`
`365`	`365`	`output: 'libxml++config.h',`
`366`	`366`	`configuration: pkg_conf_data,`
	`367`	`+ install: true,`
`367`	`368`	`install_dir: install_includeconfigdir,`
	`369`	`+ install_tag: 'devel',`
`368`	`370`	`)`
`369`	`371`
`370`	`372`	`subdir('MSVC_NMake/libxml++')`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ foreach ex : test_programs`
`25`	`25`	`exe_file = executable(ex_name, ex_sources,`
`26`	`26`	`dependencies: xmlxx_own_dep,`
`27`	`27`	`implicit_include_directories: false,`
`28`		`- build_by_default: build_tests`
	`28`	`+ build_by_default: build_tests,`
	`29`	`+ install: false,`
`29`	`30`	`)`
`30`	`31`
`31`	`32`	`if build_tests`