diff options
author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-05-05 10:59:53 +0200 |
---|---|---|
committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-05-05 10:59:53 +0200 |
commit | 983668cfd40f5eed4a555922586826ccdef560de (patch) | |
tree | 84617e381db82b59d231460943b9337e0ebdd4b2 /glib/glibmm | |
parent | 1aa4335eaf1a82764a7319e2d3bf536fba63def3 (diff) | |
download | glibmm-983668cfd40f5eed4a555922586826ccdef560de.tar.gz |
Subprojects can use meson.add_dist_script() if meson.version() >= 0.58.0
* meson.build:
* docs/reference/meson.build:
* gio/giomm/meson.build:
* glib/glibmm/meson.build:
Call add_dist_script() in a subproject, if meson.version() >= 0.58.0.
* tools/build_scripts/handle-built-files.py:
Use MESON_PROJECT_DIST_ROOT if it exists, else MESON_DIST_ROOT.
It exists if meson.version() >= 0.58.0.
Diffstat (limited to 'glib/glibmm')
-rw-r--r-- | glib/glibmm/meson.build | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/glib/glibmm/meson.build b/glib/glibmm/meson.build index 5ba85320..b736a3cf 100644 --- a/glib/glibmm/meson.build +++ b/glib/glibmm/meson.build @@ -4,7 +4,7 @@ # generate_binding_py, handle_built_files_py, m4_files, pm_files, # glibmm_libversion, install_includedir, python3, glibmm_rc, gmmproc_dir, # is_host_windows, gmmproc, generate_wrap_init_pl, glibmm_libname, -# macos_darwin_versions +# macos_darwin_versions, can_add_dist_script # Output: glibmm_hg_ccg_basenames, glibmm_extra_h_files, built_files_root, # glibmm_built_h_file_targets, glibmm_h_m4_files, glibmm_own_dep @@ -328,9 +328,8 @@ meson.add_install_script( glibmm_h_m4_files, ) -if not meson.is_subproject() +if can_add_dist_script # Distribute built files. - # (add_dist_script() is not allowed in a subproject) meson.add_dist_script( python3.path(), generate_binding_py, 'dist_built_files', built_h_cc_dir, |