Skip to content
Snippets Groups Projects
Commit 270fa6d8 authored by Simon McVittie's avatar Simon McVittie
Browse files

build: Consistently use project_include_dirs everywhere


This matters when invoked as a subproject, for example by
pressure-vessel, in which case we don't get -I$(top_builddir).

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 1b96274a
No related branches found
No related tags found
1 merge request!82Enable and squash compiler warnings
Pipeline #1929 passed
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
executable( executable(
multiarch + '-true', multiarch + '-true',
'true.c', 'true.c',
include_directories : project_include_dirs,
install : true, install : true,
install_dir : pkglibexecdir, install_dir : pkglibexecdir,
# Deliberately no RPATH/RUNPATH here: it's unnecessary because this # Deliberately no RPATH/RUNPATH here: it's unnecessary because this
...@@ -46,6 +47,7 @@ executable( ...@@ -46,6 +47,7 @@ executable(
multiarch + '-inspect-library', multiarch + '-inspect-library',
'inspect-library.c', 'inspect-library.c',
dependencies : [libdl], dependencies : [libdl],
include_directories : project_include_dirs,
install : true, install : true,
install_dir : pkglibexecdir, install_dir : pkglibexecdir,
# Deliberately no RPATH/RUNPATH here: we want to determine whether # Deliberately no RPATH/RUNPATH here: we want to determine whether
...@@ -56,6 +58,7 @@ executable( ...@@ -56,6 +58,7 @@ executable(
multiarch + '-check-vulkan', multiarch + '-check-vulkan',
'check-vulkan.cpp', 'check-vulkan.cpp',
dependencies : [vulkan, xcb], dependencies : [vulkan, xcb],
include_directories : project_include_dirs,
install : true, install : true,
install_dir : join_paths( install_dir : join_paths(
get_option('libexecdir'), get_option('libexecdir'),
......
...@@ -65,6 +65,7 @@ install_subdir('sysroots', install_dir : tests_dir) ...@@ -65,6 +65,7 @@ install_subdir('sysroots', install_dir : tests_dir)
executable( executable(
'mock-true', 'mock-true',
join_paths('..', 'helpers', 'true.c'), join_paths('..', 'helpers', 'true.c'),
include_directories : project_include_dirs,
install : get_option('installed_tests'), install : get_option('installed_tests'),
install_dir : tests_dir, install_dir : tests_dir,
) )
...@@ -77,6 +78,7 @@ foreach test_name : tests ...@@ -77,6 +78,7 @@ foreach test_name : tests
'-D_SRT_MULTIARCH="' + multiarch + '"', '-D_SRT_MULTIARCH="' + multiarch + '"',
], ],
dependencies : [glib, gobject, libsteamrt_dep, json_glib], dependencies : [glib, gobject, libsteamrt_dep, json_glib],
include_directories : project_include_dirs,
install : get_option('installed_tests'), install : get_option('installed_tests'),
install_dir : tests_dir, install_dir : tests_dir,
) )
...@@ -146,6 +148,7 @@ executable( ...@@ -146,6 +148,7 @@ executable(
executable( executable(
'mock-good-wflinfo', 'mock-good-wflinfo',
'mock-good-wflinfo.c', 'mock-good-wflinfo.c',
include_directories : project_include_dirs,
install: true, install: true,
install_dir: tests_dir install_dir: tests_dir
) )
...@@ -153,6 +156,7 @@ executable( ...@@ -153,6 +156,7 @@ executable(
executable( executable(
'mock-hanging-wflinfo', 'mock-hanging-wflinfo',
'mock-hanging-wflinfo.c', 'mock-hanging-wflinfo.c',
include_directories : project_include_dirs,
install: true, install: true,
install_dir: tests_dir install_dir: tests_dir
) )
...@@ -160,6 +164,7 @@ executable( ...@@ -160,6 +164,7 @@ executable(
executable( executable(
'mock-bad-wflinfo', 'mock-bad-wflinfo',
'mock-bad-wflinfo.c', 'mock-bad-wflinfo.c',
include_directories : project_include_dirs,
install: true, install: true,
install_dir: tests_dir install_dir: tests_dir
) )
...@@ -167,6 +172,7 @@ executable( ...@@ -167,6 +172,7 @@ executable(
executable( executable(
'mock-software-wflinfo', 'mock-software-wflinfo',
'mock-software-wflinfo.c', 'mock-software-wflinfo.c',
include_directories : project_include_dirs,
install: true, install: true,
install_dir: tests_dir install_dir: tests_dir
) )
...@@ -174,6 +180,7 @@ executable( ...@@ -174,6 +180,7 @@ executable(
executable( executable(
'mock-good-vulkaninfo', 'mock-good-vulkaninfo',
'mock-good-vulkaninfo.c', 'mock-good-vulkaninfo.c',
include_directories : project_include_dirs,
install: true, install: true,
install_dir: tests_dir install_dir: tests_dir
) )
...@@ -181,6 +188,7 @@ executable( ...@@ -181,6 +188,7 @@ executable(
executable( executable(
'mock-bad-vulkaninfo', 'mock-bad-vulkaninfo',
'mock-bad-vulkaninfo.c', 'mock-bad-vulkaninfo.c',
include_directories : project_include_dirs,
install: true, install: true,
install_dir: tests_dir install_dir: tests_dir
) )
...@@ -188,6 +196,7 @@ executable( ...@@ -188,6 +196,7 @@ executable(
executable( executable(
'mock-good-check-vulkan', 'mock-good-check-vulkan',
join_paths('..', 'helpers', 'true.c'), join_paths('..', 'helpers', 'true.c'),
include_directories : project_include_dirs,
install: true, install: true,
install_dir: tests_dir install_dir: tests_dir
) )
...@@ -195,6 +204,7 @@ executable( ...@@ -195,6 +204,7 @@ executable(
executable( executable(
'mock-bad-check-vulkan', 'mock-bad-check-vulkan',
'mock-bad-check-vulkan.c', 'mock-bad-check-vulkan.c',
include_directories : project_include_dirs,
install: true, install: true,
install_dir: tests_dir install_dir: tests_dir
) )
...@@ -202,6 +212,7 @@ executable( ...@@ -202,6 +212,7 @@ executable(
executable( executable(
'mock-mixed-vulkaninfo', 'mock-mixed-vulkaninfo',
'mock-good-vulkaninfo.c', 'mock-good-vulkaninfo.c',
include_directories : project_include_dirs,
install: true, install: true,
install_dir: tests_dir install_dir: tests_dir
) )
...@@ -209,6 +220,7 @@ executable( ...@@ -209,6 +220,7 @@ executable(
executable( executable(
'mock-mixed-check-vulkan', 'mock-mixed-check-vulkan',
'mock-bad-check-vulkan.c', 'mock-bad-check-vulkan.c',
include_directories : project_include_dirs,
install: true, install: true,
install_dir: tests_dir install_dir: tests_dir
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment