diff options
-rw-r--r-- | bindings/cpp/test/headers/meson.build | 1 | ||||
-rw-r--r-- | examples/meson.build | 4 | ||||
-rw-r--r-- | examples/pugl_cairo_demo.app/MacOS/meson.build | 1 | ||||
-rw-r--r-- | examples/pugl_clipboard_demo.app/MacOS/meson.build | 1 | ||||
-rw-r--r-- | examples/pugl_cpp_demo.app/MacOS/meson.build | 1 | ||||
-rw-r--r-- | examples/pugl_cursor_demo.app/MacOS/meson.build | 1 | ||||
-rw-r--r-- | examples/pugl_embed_demo.app/MacOS/meson.build | 1 | ||||
-rw-r--r-- | examples/pugl_management_demo.app/MacOS/meson.build | 1 | ||||
-rw-r--r-- | examples/pugl_shader_demo.app/MacOS/meson.build | 1 | ||||
-rw-r--r-- | examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build | 1 | ||||
-rw-r--r-- | examples/pugl_vulkan_demo.app/MacOS/meson.build | 1 | ||||
-rw-r--r-- | examples/pugl_window_demo.app/MacOS/meson.build | 1 | ||||
-rw-r--r-- | meson.build | 5 | ||||
-rw-r--r-- | test/cpp/meson.build | 2 | ||||
-rw-r--r-- | test/headers/meson.build | 1 | ||||
-rw-r--r-- | test/meson.build | 5 |
16 files changed, 28 insertions, 0 deletions
diff --git a/bindings/cpp/test/headers/meson.build b/bindings/cpp/test/headers/meson.build index 0100853..064c2cf 100644 --- a/bindings/cpp/test/headers/meson.build +++ b/bindings/cpp/test/headers/meson.build @@ -33,6 +33,7 @@ test( files('test_headers.cpp'), cpp_args: test_headers_cpp_args, dependencies: [puglpp_dep, vulkan_dep], + implicit_include_directories: false, ), suite: 'unit', ) diff --git a/examples/meson.build b/examples/meson.build index 6a58619..65daa31 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -123,6 +123,7 @@ else c_args: example_defines + example_c_args + defines, cpp_args: example_defines + example_cpp_args + defines, dependencies: dependencies, + implicit_include_directories: false, ) endforeach @@ -154,6 +155,7 @@ else c_args: example_defines + example_c_args + defines, cpp_args: example_defines + example_cpp_args + defines, dependencies: dependencies, + implicit_include_directories: false, ) endforeach endif @@ -167,6 +169,7 @@ else example, c_args: example_defines + example_c_args + cairo_args, dependencies: [pugl_dep, pugl_cairo_dep, puglutil_dep], + implicit_include_directories: false, ) endforeach endif @@ -195,6 +198,7 @@ else c_args: example_defines + example_c_args + defines, cpp_args: example_defines + example_cpp_args + defines, dependencies: dependencies, + implicit_include_directories: false, ) endforeach endif diff --git a/examples/pugl_cairo_demo.app/MacOS/meson.build b/examples/pugl_cairo_demo.app/MacOS/meson.build index 6143429..e8a5242 100644 --- a/examples/pugl_cairo_demo.app/MacOS/meson.build +++ b/examples/pugl_cairo_demo.app/MacOS/meson.build @@ -7,4 +7,5 @@ executable( c_args: example_defines + example_c_args + cairo_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_cairo_dep, puglutil_dep], + implicit_include_directories: false, ) diff --git a/examples/pugl_clipboard_demo.app/MacOS/meson.build b/examples/pugl_clipboard_demo.app/MacOS/meson.build index 0727404..f56ae59 100644 --- a/examples/pugl_clipboard_demo.app/MacOS/meson.build +++ b/examples/pugl_clipboard_demo.app/MacOS/meson.build @@ -6,4 +6,5 @@ executable( '../../pugl_clipboard_demo.c', c_args: example_defines + example_c_args, dependencies: [pugl_dep, pugl_gl_dep, puglutil_dep], + implicit_include_directories: false, ) diff --git a/examples/pugl_cpp_demo.app/MacOS/meson.build b/examples/pugl_cpp_demo.app/MacOS/meson.build index a8eda53..891dcd9 100644 --- a/examples/pugl_cpp_demo.app/MacOS/meson.build +++ b/examples/pugl_cpp_demo.app/MacOS/meson.build @@ -7,4 +7,5 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [puglpp_dep, pugl_gl_dep, puglutil_dep], + implicit_include_directories: false, ) diff --git a/examples/pugl_cursor_demo.app/MacOS/meson.build b/examples/pugl_cursor_demo.app/MacOS/meson.build index 6e6209a..0836875 100644 --- a/examples/pugl_cursor_demo.app/MacOS/meson.build +++ b/examples/pugl_cursor_demo.app/MacOS/meson.build @@ -7,4 +7,5 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_gl_dep, puglutil_dep], + implicit_include_directories: false, ) diff --git a/examples/pugl_embed_demo.app/MacOS/meson.build b/examples/pugl_embed_demo.app/MacOS/meson.build index 65f2fdf..34d4ccb 100644 --- a/examples/pugl_embed_demo.app/MacOS/meson.build +++ b/examples/pugl_embed_demo.app/MacOS/meson.build @@ -7,4 +7,5 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_gl_dep, puglutil_dep], + implicit_include_directories: false, ) diff --git a/examples/pugl_management_demo.app/MacOS/meson.build b/examples/pugl_management_demo.app/MacOS/meson.build index fedcd17..308a88c 100644 --- a/examples/pugl_management_demo.app/MacOS/meson.build +++ b/examples/pugl_management_demo.app/MacOS/meson.build @@ -7,4 +7,5 @@ executable( c_args: example_defines + example_c_args + cairo_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_cairo_dep, puglutil_dep], + implicit_include_directories: false, ) diff --git a/examples/pugl_shader_demo.app/MacOS/meson.build b/examples/pugl_shader_demo.app/MacOS/meson.build index 5bdc06e..afcd532 100644 --- a/examples/pugl_shader_demo.app/MacOS/meson.build +++ b/examples/pugl_shader_demo.app/MacOS/meson.build @@ -11,4 +11,5 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_gl_dep, dl_dep, puglutil_dep], + implicit_include_directories: false, ) diff --git a/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build b/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build index 5bb9729..7e7556b 100644 --- a/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build +++ b/examples/pugl_vulkan_cpp_demo.app/MacOS/meson.build @@ -10,4 +10,5 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [puglpp_dep, pugl_vulkan_dep, puglutil_dep], + implicit_include_directories: false, ) diff --git a/examples/pugl_vulkan_demo.app/MacOS/meson.build b/examples/pugl_vulkan_demo.app/MacOS/meson.build index f7ef1a4..0f7f4bf 100644 --- a/examples/pugl_vulkan_demo.app/MacOS/meson.build +++ b/examples/pugl_vulkan_demo.app/MacOS/meson.build @@ -9,4 +9,5 @@ executable( ], c_args: example_defines + example_c_args, dependencies: [pugl_dep, pugl_vulkan_dep, puglutil_dep], + implicit_include_directories: false, ) diff --git a/examples/pugl_window_demo.app/MacOS/meson.build b/examples/pugl_window_demo.app/MacOS/meson.build index 6c0f0de..f2623f2 100644 --- a/examples/pugl_window_demo.app/MacOS/meson.build +++ b/examples/pugl_window_demo.app/MacOS/meson.build @@ -7,4 +7,5 @@ executable( c_args: example_defines + example_c_args, cpp_args: example_defines + example_cpp_args, dependencies: [pugl_dep, pugl_gl_dep, puglutil_dep], + implicit_include_directories: false, ) diff --git a/meson.build b/meson.build index e82dec4..6fc3973 100644 --- a/meson.build +++ b/meson.build @@ -243,6 +243,7 @@ libpugl = library( c_args: library_args + core_args, dependencies: core_deps, gnu_symbol_visibility: 'hidden', + implicit_include_directories: false, include_directories: includes, install: true, soversion: soversion, @@ -282,6 +283,7 @@ if get_option('stub') c_args: library_args, dependencies: [pugl_dep], gnu_symbol_visibility: 'hidden', + implicit_include_directories: false, include_directories: includes, install: true, soversion: soversion, @@ -324,6 +326,7 @@ if opengl_dep.found() c_args: library_args, dependencies: [pugl_dep, opengl_dep], gnu_symbol_visibility: 'hidden', + implicit_include_directories: false, include_directories: includes, install: true, soversion: soversion, @@ -377,6 +380,7 @@ if cairo_dep.found() c_args: library_args + cairo_args, dependencies: [pugl_dep, cairo_dep], gnu_symbol_visibility: 'hidden', + implicit_include_directories: false, include_directories: includes, install: true, objc_args: library_args + cairo_args, @@ -432,6 +436,7 @@ if vulkan_dep.found() c_args: library_args, dependencies: vulkan_deps, gnu_symbol_visibility: 'hidden', + implicit_include_directories: false, include_directories: includes, install: true, soversion: soversion, diff --git a/test/cpp/meson.build b/test/cpp/meson.build index 73e2320..94c64d1 100644 --- a/test/cpp/meson.build +++ b/test/cpp/meson.build @@ -54,6 +54,7 @@ if host_machine.system() == 'darwin' 'test_inline_objcpp', 'test_inline_objcpp.mm', dependencies: unified_deps, + implicit_include_directories: false, include_directories: include_directories('../../include'), objcpp_args: objcpp_unified_args, ), @@ -99,6 +100,7 @@ elif is_variable('cpp') 'test_inline_cpp.cpp', cpp_args: cpp_unified_args, dependencies: unified_deps, + implicit_include_directories: false, include_directories: include_directories('../../include'), ), suite: 'unit', diff --git a/test/headers/meson.build b/test/headers/meson.build index a6c279e..69fd51b 100644 --- a/test/headers/meson.build +++ b/test/headers/meson.build @@ -30,6 +30,7 @@ test( files('test_headers.c'), c_args: test_headers_c_args, dependencies: [pugl_dep, vulkan_dep], + implicit_include_directories: false, ), suite: 'unit', ) diff --git a/test/meson.build b/test/meson.build index 5d67d4c..f047ff0 100644 --- a/test/meson.build +++ b/test/meson.build @@ -64,6 +64,7 @@ foreach test : basic_tests 'test_@0@.c'.format(test), c_args: test_c_args, dependencies: [pugl_dep, pugl_stub_dep, puglutil_dep], + implicit_include_directories: false, ), suite: 'unit', ) @@ -77,6 +78,7 @@ foreach test : basic_exclusive_tests 'test_@0@.c'.format(test), c_args: test_c_args, dependencies: [pugl_dep, pugl_stub_dep, puglutil_dep], + implicit_include_directories: false, ), is_parallel: false, suite: 'unit', @@ -92,6 +94,7 @@ if opengl_dep.found() 'test_@0@.c'.format(test), c_args: test_c_args, dependencies: [pugl_dep, pugl_gl_dep, puglutil_dep], + implicit_include_directories: false, ), suite: 'unit', ) @@ -107,6 +110,7 @@ if cairo_dep.found() 'test_@0@.c'.format(test), c_args: test_c_args + cairo_args, dependencies: [pugl_dep, pugl_cairo_dep, puglutil_dep], + implicit_include_directories: false, ), suite: 'unit', ) @@ -122,6 +126,7 @@ if vulkan_dep.found() 'test_@0@.c'.format(test), c_args: test_c_args, dependencies: [pugl_dep, pugl_vulkan_dep, puglutil_dep], + implicit_include_directories: false, ), suite: 'unit', ) |