Skip to content

Commit

Permalink
Workaround for headers in source directory.
Browse files Browse the repository at this point in the history
  • Loading branch information
piotrrak committed Sep 24, 2020
1 parent 88f0cdd commit 491f102
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 5 deletions.
7 changes: 7 additions & 0 deletions src/avcpp/filters/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
foreach hdr : avcpp_filter_header
configure_file(
copy: true,
input: hdr,
output: '@PLAINNAME@'
)
endforeach
9 changes: 9 additions & 0 deletions src/avcpp/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
foreach hdr : avcpp_header
configure_file(
copy: true,
input: hdr,
output: '@PLAINNAME@'
)
endforeach

subdir('filters')
14 changes: 9 additions & 5 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ avcpp_sources = [

]

avcpp_header = [
avcpp_header = files(
'audioresampler.h',
'averror.h',
'av.h',
Expand All @@ -98,16 +98,17 @@ avcpp_header = [
'stream.h',
'timestamp.h',
'videorescaler.h',
]
)

avcpp_filter_header = [
avcpp_filter_header = files(
'filters/buffersink.h',
'filters/buffersrc.h',
'filters/filtercontext.h',
'filters/filtergraph.h',
'filters/filter.h',
'filters/filterpad.h',
]
)


#defining how to build the library
avcpp = library(
Expand All @@ -120,10 +121,13 @@ avcpp = library(
install : true
)

# make library usable as meson subproject
# workarounds https://github.com/mesonbuild/meson/issues/2546
subdir('avcpp')

install_headers(avcpp_header, subdir : 'avcpp')
install_headers(avcpp_filter_header, subdir : 'avcpp/filters')


#export the dependency information
avcpp_dep = declare_dependency(
include_directories : avcpp_incdir,
Expand Down

0 comments on commit 491f102

Please sign in to comment.