diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-05-05 16:11:55 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-05-05 16:11:55 +0200 |
| commit | 646a6dad2ff5f8b56f44e787b1a8385fe9c1735a (patch) | |
| tree | fa85b52d59bdabbd25966985fe48954a7a33b8ca /meson.build | |
| parent | 6bee90d46a481adafe5ad86618a2f3d74482b942 (diff) | |
Subprojects can use meson.add_dist_script() if meson.version() >= 0.58.0
* meson.build:
* docs/reference/meson.build:
Call add_dist_script() in a subproject, if meson.version() >= 0.58.0.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 66d10c7..c3ba43e 100644 --- a/meson.build +++ b/meson.build @@ -257,6 +257,9 @@ cairommconfig_h = configure_file( install_dir: install_includeconfigdir, ) +# add_dist_script() is not allowed in a subproject if meson.version() < 0.58.0. +can_add_dist_script = not meson.is_subproject() or meson.version().version_compare('>= 0.58.0') + subdir('MSVC_NMake/cairomm') subdir('data') subdir('cairomm') @@ -264,9 +267,8 @@ subdir('examples') subdir('tests') subdir('docs/reference') -if not meson.is_subproject() +if can_add_dist_script # Add a ChangeLog file to the distribution directory. - # (add_dist_script() is not allowed in a subproject) meson.add_dist_script( python3.path(), dist_changelog_py, project_source_root, @@ -284,8 +286,9 @@ if not meson.is_subproject() 'untracked' / 'build_scripts', dont_distribute, ) -else - # This is a subproject. +endif + +if meson.is_subproject() cairomm_dep = declare_dependency( dependencies: cairomm_own_dep, variables: { |