shithub: dav1d

Info  •  Files  •  Log  •  Branches

Fix building as a meson subproject

- When building dav1d as a dependency fallback, the parent project needs
to provide the variable name of a dependency object, added dav1d_dep for
that.
- SOURCE_ROOT is the root of the main project source tree, use
current_source_dir() instead.

--- a/meson.build

+++ b/meson.build

@@ -401,7 +401,7 @@

         depfile: '@BASENAME@.obj.ndep',

         arguments: [

             '-f', nasm_format,

-            '-I', '@SOURCE_DIR@/src/',

+            '-I', '@0@/src/'.format(meson.current_source_dir()),

             '-I', '@0@/'.format(meson.current_build_dir()),

             '-MQ', '@OUTPUT@', '-MF', '@DEPFILE@',

             '@EXTRA_ARGS@',

--- a/src/meson.build

+++ b/src/meson.build

@@ -287,6 +287,10 @@

     install : true,

 )

+dav1d_dep = declare_dependency(link_with: libdav1d,

+    include_directories : include_directories('../include/dav1d')

+)

+

 #

 # Generate pkg-config .pc file

 #