Merge branch 'ebassi/version-header-install' into 'main'

Install gversionmacros.h in the right place

See merge request GNOME/glib!3018
This commit is contained in:
Marco Trevisan 2022-10-26 15:04:01 +00:00
commit 1590e7636c

View File

@ -12,8 +12,8 @@ gversionmacros_h = custom_target(
output: 'gversionmacros.h', output: 'gversionmacros.h',
command: [gen_visibility_macros, meson.project_version(), 'versions-macros', '@INPUT@', '@OUTPUT@'], command: [gen_visibility_macros, meson.project_version(), 'versions-macros', '@INPUT@', '@OUTPUT@'],
install: true, install: true,
install_dir: glib_includedir, install_dir: glib_sub_includedir,
install_tag : 'devel', install_tag: 'devel',
) )
gvisibility_h = custom_target( gvisibility_h = custom_target(
@ -21,6 +21,7 @@ gvisibility_h = custom_target(
command: [gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GLIB', '@OUTPUT@'], command: [gen_visibility_macros, meson.project_version(), 'visibility-macros', 'GLIB', '@OUTPUT@'],
install: true, install: true,
install_dir: glib_sub_includedir, install_dir: glib_sub_includedir,
install_tag: 'devel',
) )
glib_built_headers = [gversionmacros_h, gvisibility_h] glib_built_headers = [gversionmacros_h, gvisibility_h]