diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-05-05 12:01:11 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-05-05 12:01:11 +0200 |
| commit | 8960f32b5ca7a805980de8154e9884caf4d1f767 (patch) | |
| tree | fc3bb27413cdd4307ad583c9f2035e7f58d337aa /MSVC_NMake | |
| parent | de48a71cbb59d3ca85a41277f496cd907df79db2 (diff) | |
| download | sigc++-8960f32b5ca7a805980de8154e9884caf4d1f767.tar.gz | |
Subprojects can use meson.add_dist_script() if meson.version() >= 0.58.0
* meson.build:
* MSVC_NMake/meson.build:
* docs/docs/manual/meson.build:
* docs/docs/reference/meson.build:
Call add_dist_script() in a subproject, if meson.version() >= 0.58.0.
* tools/handle-built-files.py:
* tools/tutorial-custom-cmd.py:
Use MESON_PROJECT_DIST_ROOT if it exists, else MESON_DIST_ROOT.
It exists if meson.version() >= 0.58.0.
Diffstat (limited to 'MSVC_NMake')
| -rw-r--r-- | MSVC_NMake/meson.build | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/MSVC_NMake/meson.build b/MSVC_NMake/meson.build index da56141..f9ddc35 100644 --- a/MSVC_NMake/meson.build +++ b/MSVC_NMake/meson.build @@ -1,6 +1,7 @@ # MSVC_NMake -# Input: pkg_conf_data, sigcxxconfig_h, project_build_root, python3 +# Input: pkg_conf_data, sigcxxconfig_h, project_build_root, python3, +# can_add_dist_script # Output: sigc_rc sigc_rc = configure_file( @@ -19,10 +20,8 @@ configure_file( untracked_msvc_nmake = 'untracked' / 'MSVC_NMake' handle_built_files = project_source_root / 'tools' / 'handle-built-files.py' -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(), handle_built_files, 'dist_gen_msvc_files', meson.current_build_dir(), |