geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: Replace 'config.h' with config_file 

This fixes an issue with libdrm failing to build when used as a meson
subproject. Using 'config.h' directly will cause it to possibly refer to
the wrong file.

By using `@0@.format(config_file)`, it will be transformed into the
correct relative path, e.g. `./config.h` in normal build,
`./subprojects/libdrm/config.h` in subproject build.

Signed-off-by: Scott Anderson <scott@anderso.nz>
Acked-by: Eric Engestrom <eric.engestrom@intel.com>
main
Scott Anderson 2019-12-17 22:08:02 +13:00 committed by Eric Engestrom
parent edafcf18e5
commit c70bd7b705
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -285,7 +285,7 @@ config_file = configure_file(
configuration : config, configuration : config,
output : 'config.h', output : 'config.h',
) )
add_project_arguments('-include', 'config.h', language : 'c') add_project_arguments('-include', '@0@'.format(config_file), language : 'c')
inc_root = include_directories('.') inc_root = include_directories('.')
inc_drm = include_directories('include/drm') inc_drm = include_directories('include/drm')