diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-04-19 10:34:00 +0200 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-06 18:27:04 +0200 |
commit | 35936316eb87f2930a3873da71eaa1c9f11e3186 (patch) | |
tree | 4d47ec683062592784fa1cbc32ad6d127b0d4456 /docs/markdown/Reference-manual.md | |
parent | 9b22147dcb0c31cc374ebf6b059f225530401a51 (diff) | |
download | meson-35936316eb87f2930a3873da71eaa1c9f11e3186.zip meson-35936316eb87f2930a3873da71eaa1c9f11e3186.tar.gz meson-35936316eb87f2930a3873da71eaa1c9f11e3186.tar.bz2 |
cmake: rebase fixes
Diffstat (limited to 'docs/markdown/Reference-manual.md')
-rw-r--r-- | docs/markdown/Reference-manual.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index 5662708..68c8f9d 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -1082,7 +1082,7 @@ res2 = foo / bar ``` Builds a library that is either static, shared or both depending on -the value of `default_library` +the value of `default_library` user [option](https://mesonbuild.com/Builtin-options.html). You should use this instead of [`shared_library`](#shared_library), [`static_library`](#static_library) or @@ -1405,11 +1405,11 @@ arguments: - `version` keyword argument that works just like the one in `dependency`. It specifies what version the subproject should be, as an example `>=1.0.1` - - `method` *(added 0.50.0)* Specifies the configuration method of the + - `method` *(added 0.51.0)* Specifies the configuration method of the subproject. Possible values are `meson`, `cmake` and `auto`. With `auto` meson will always prefer a `meson.build` in the subproject over other methods. The default value of `method` is `auto`. - - `cmake_options` *(added 0.50.0)* List of additional CMake options + - `cmake_options` *(added 0.51.0)* List of additional CMake options - `required` *(added 0.48.0)* By default, `required` is `true` and Meson will abort if the subproject could not be setup. You can set this to `false` and then use the `.found()` method on the [returned @@ -2180,7 +2180,7 @@ an external dependency with the following methods: dep3 will add `['-Werror=foo', '-Werror=bar']` to the compiler args of any target it is added to, but libfoo will not be added to the link_args. - + *Note*: A bug present until 0.50.1 results in the above behavior not working correctly. |