diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-06 13:09:46 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-08-06 13:09:46 +0300 |
commit | 06f195e9ec1e8ea399ebb138b63865c1e3f4c90d (patch) | |
tree | 8c5676689b87480bb89b6354bb052d36949de421 /docs/markdown | |
parent | a19f906258a423bdf1b4ba60877080e5f2becc9e (diff) | |
parent | 5cb1d00537afb9d52f89f7b3dc65e01f068fd442 (diff) | |
download | meson-06f195e9ec1e8ea399ebb138b63865c1e3f4c90d.zip meson-06f195e9ec1e8ea399ebb138b63865c1e3f4c90d.tar.gz meson-06f195e9ec1e8ea399ebb138b63865c1e3f4c90d.tar.bz2 |
Merged exclude_dir branch.
Diffstat (limited to 'docs/markdown')
-rw-r--r-- | docs/markdown/Reference-manual.md | 10 | ||||
-rw-r--r-- | docs/markdown/Release-notes-for-0.42.0.md | 16 |
2 files changed, 21 insertions, 5 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index 265f76d..84b2fb1 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -475,11 +475,19 @@ Installs the specified man files from the source tree into system's man director ### install_subdir() ``` meson - void install_subdir(subdir_name) + void install_subdir(subdir_name, install_dir : ..., exclude_files : ..., exclude_directories : ...) ``` Installs the entire given subdirectory and its contents from the source tree to the location specified by the keyword argument `install_dir`. Note that due to implementation issues this command deletes the entire target dir before copying the files, so you should never use `install_subdir` to install into two overlapping directories (such as `foo` and `foo/bar`) because if you do the behavior is undefined. +The following keyword arguments are supported: + +- `install_dir`: the location to place the installed subdirectory. +- `exclude_files`: a list of file names that should not be installed. + Names are interpreted as paths relative to the `subdir_name` location. +- `exclude_directories`: a list of directory names that should not be installed. + Names are interpreted as paths relative to the `subdir_name` location. + ### is_variable() ``` meson diff --git a/docs/markdown/Release-notes-for-0.42.0.md b/docs/markdown/Release-notes-for-0.42.0.md index f3127de..7eb603d 100644 --- a/docs/markdown/Release-notes-for-0.42.0.md +++ b/docs/markdown/Release-notes-for-0.42.0.md @@ -108,7 +108,15 @@ directories are not used. ## Support for MPI dependency MPI is now supported as a dependency. Because dependencies are -language-specific, you must specify the requested language with the `language` -keyword, i.e., `dependency('mpi', language='c')` will request the C MPI headers -and libraries. See [the MPI dependency](Dependencies.md#mpi) for more -information. +language-specific, you must specify the requested language with the +`language` keyword, i.e., `dependency('mpi', language='c')` will +request the C MPI headers and libraries. See [the MPI +dependency](Dependencies.md#mpi) for more information. + +## Allow excluding files or directories from `install_subdir` + +The [`install_subdir`](Reference-manual.md#install_subdir) command +accepts the new `exclude_files` and `exclude_directories` keyword +arguments that allow specified files or directories to be excluded +from the installed subdirectory. + |