Skip to content

Commit f66073b

Browse files
committed
I think I need to add the generated sources to the internal library dependency.
1 parent 091b884 commit f66073b

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

subprojects/packagefiles/poppler/glib/meson.build

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@ if building_glib_wrapper
2121
'poppler-input-stream.cc',
2222
'poppler-structure-element.cc',
2323
]
24-
poppler_glib_library_sources += configure_file(
24+
poppler_glib_library_features_h = configure_file(
2525
configuration: poppler_configuration,
2626
input: 'poppler-features.h.cmake',
2727
output: 'poppler-features.h',
2828
format: 'cmake',
2929
install: true,
3030
install_dir: get_option('includedir') / meson.project_name() / 'glib',
3131
)
32-
poppler_glib_library_sources += configure_file(
32+
poppler_glib_library_sources += poppler_glib_library_features_h
33+
poppler_glib_library_macros_h = configure_file(
3334
input: poppler_exports_h_in,
3435
output: 'poppler-macros.h',
3536
configuration: {
@@ -39,6 +40,7 @@ if building_glib_wrapper
3940
install: true,
4041
install_dir: get_option('includedir') / meson.project_name() / 'blib',
4142
)
43+
poppler_glib_library_sources += poppler_glib_library_macros_h
4244

4345
poppler_glib_library_headers = files(
4446
'poppler-action.h',
@@ -56,14 +58,15 @@ if building_glib_wrapper
5658
)
5759

5860
gnome_module = import('gnome')
59-
poppler_glib_library_sources += gnome_module.mkenums(
61+
poppler_glib_library_enums = gnome_module.mkenums(
6062
'bogus',
6163
c_template: 'poppler-enums.c.template',
6264
h_template: 'poppler-enums.h.template',
6365
install_header: true,
6466
install_dir: get_option('includedir') / meson.project_name() / 'glib',
6567
sources: poppler_glib_library_headers,
6668
)
69+
poppler_glib_library_sources += poppler_glib_library_enums
6770

6871
poppler_glib_library_cpp_arguments = []
6972
if get_option('default_library') == 'static'
@@ -100,6 +103,11 @@ if building_glib_wrapper
100103
link_with: poppler_glib_library,
101104
dependencies: poppler_glib_library_dependencies,
102105
include_directories: poppler_glib_library_include_directories,
106+
sources: [
107+
poppler_glib_library_enums,
108+
poppler_glib_library_features_h,
109+
poppler_glib_library_macros_h,
110+
],
103111
)
104112

105113
meson.override_dependency('poppler-glib', poppler_glib_library_dep)

0 commit comments

Comments
 (0)