Meson build: No implicit_include_directories

kjellahl · kjellahl · commit ce4f49ba8138 · 2021-04-07T16:40:51.000+02:00
diff --git a/examples/meson.build b/examples/meson.build
@@ -22,6 +22,7 @@ foreach ex : examples
   exe_file = executable(ex_name, ex_sources,
     cpp_args: '-DSIGCXX_DISABLE_DEPRECATED',
     dependencies: sigcxx_own_dep,
+    implicit_include_directories: false,
     gui_app: false,
     build_by_default: build_examples
   )
diff --git a/sigc++/adaptors/lambda/meson.build b/sigc++/adaptors/lambda/meson.build
@@ -1,7 +1,6 @@
 # sigc++/adaptors/lambda
 
-# Input: python3, handle_built_files, m4_template, m4_include_dir
-# Output:
+# Input: maintainer_mode, python3, handle_built_files, m4_template, m4_include_dir
 # Input and output: built_h_files, built_cc_files, built_h_file_targets,
 #                   built_cc_file_targets
 
diff --git a/sigc++/adaptors/meson.build b/sigc++/adaptors/meson.build
@@ -1,7 +1,6 @@
 # sigc++/adaptors
 
-# Input: python3, handle_built_files, m4_template, m4_include_dir
-# Output:
+# Input: maintainer_mode, python3, handle_built_files, m4_template, m4_include_dir
 # Input and output: built_h_files, built_h_file_targets
 
 # .m4 files to build .h files from.
diff --git a/sigc++/functors/meson.build b/sigc++/functors/meson.build
@@ -1,7 +1,6 @@
 # sigc++/functors
 
-# Input: python3, handle_built_files, m4_template, m4_include_dir
-# Output:
+# Input: maintainer_mode, python3, handle_built_files, m4_template, m4_include_dir
 # Input and output: built_h_files, built_h_file_targets
 
 # .m4 files to build .h files from.
diff --git a/sigc++/meson.build b/sigc++/meson.build
@@ -2,7 +2,7 @@
 
 # Input: sigcxx_build_dep, sigcxx_pcname, sigcxx_libversion, sigcxx_api_version,
 #        install_includedir, project_source_root, sigc_res, python3,
-#        handle_built_files
+#        handle_built_files, maintainer_mode
 # Output: source_h_files, built_h_files, sigcxx_own_dep, built_files_root,
 #         built_h_file_targets
 
diff --git a/tests/meson.build b/tests/meson.build
@@ -58,6 +58,7 @@ foreach ex : test_programs
 
   exe_file = executable(ex_name, ex_sources,
     dependencies: sigcxx_own_dep,
+    implicit_include_directories: false,
     gui_app: false,
     build_by_default: true
   )
@@ -79,6 +80,7 @@ if can_benchmark
 
     exe_file = executable(ex_name, ex_sources,
       dependencies: [sigcxx_own_dep, benchmark_dep],
+      implicit_include_directories: false,
       gui_app: false,
       build_by_default: do_benchmark
     )

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ foreach ex : examples`
`22`	`22`	`exe_file = executable(ex_name, ex_sources,`
`23`	`23`	`cpp_args: '-DSIGCXX_DISABLE_DEPRECATED',`
`24`	`24`	`dependencies: sigcxx_own_dep,`
	`25`	`+ implicit_include_directories: false,`
`25`	`26`	`gui_app: false,`
`26`	`27`	`build_by_default: build_examples`
`27`	`28`	`)`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ foreach ex : test_programs`
`58`	`58`
`59`	`59`	`exe_file = executable(ex_name, ex_sources,`
`60`	`60`	`dependencies: sigcxx_own_dep,`
	`61`	`+ implicit_include_directories: false,`
`61`	`62`	`gui_app: false,`
`62`	`63`	`build_by_default: true`
`63`	`64`	`)`
`@@ -79,6 +80,7 @@ if can_benchmark`
`79`	`80`
`80`	`81`	`exe_file = executable(ex_name, ex_sources,`
`81`	`82`	`dependencies: [sigcxx_own_dep, benchmark_dep],`
	`83`	`+ implicit_include_directories: false,`
`82`	`84`	`gui_app: false,`
`83`	`85`	`build_by_default: do_benchmark`
`84`	`86`	`)`