diff options
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Reference-manual.md | 19 | ||||
| -rw-r--r-- | docs/markdown/snippets/native_property.md | 8 |
2 files changed, 17 insertions, 10 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index 690ae0b..4e59030 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -1773,10 +1773,6 @@ the following methods. refer to files in the current or any other source directory instead of constructing paths manually with `meson.current_source_dir()`. -- `get_cross_property(propname, fallback_value)` returns the given - property from a cross file, the optional second argument is returned - if not cross compiling or the given property is not found. - - `get_compiler(language)` returns [an object describing a compiler](#compiler-object), takes one positional argument which is the language to use. It also accepts one keyword argument, `native` @@ -1786,9 +1782,18 @@ the following methods. returns the "cross" compiler if we're currently cross-compiling and the "native" compiler if we're not. -- `get_native_property(propname, fallback_value)` returns the given - property from a native file, the optional second argument is returned - if the given property is not found. +- `get_cross_property(propname, fallback_value)` + *Consider get_external_property() instead*. Returns the given + property from a cross file, the optional fallback_value is returned + if not cross compiling or the given property is not found. + +- `get_external_property(propname, fallback_value, native: true/false)` + *(added 0.53.0)* returns the given property from a native or cross file. + The optional fallback_value is returned if the given property is not found. + The optional `native: true` forces retrieving a variable from the + native file, even when cross-compiling. + If `native: false` or not specified, variable is retrieved from the + cross-file if cross-compiling, and from the native-file when not cross-compiling. - `has_exe_wrapper()` returns true when doing a cross build if there is a wrapper command that can be used to execute cross built diff --git a/docs/markdown/snippets/native_property.md b/docs/markdown/snippets/native_property.md index 6c49e80..3845fa1 100644 --- a/docs/markdown/snippets/native_property.md +++ b/docs/markdown/snippets/native_property.md @@ -1,6 +1,6 @@ ## Native file properties -As of Meson 0.53.0, the `--native-file foo.txt` can contain: +As of Meson 0.53.0, the `--native-file nativefile.ini` can contain: * binaries * paths @@ -10,7 +10,9 @@ which are defined and used the same way as in cross files. The `properties` are new for Meson 0.53.0, and are read like: ```meson -x = meson.get_native_property('foobar', 'foo') +x = meson.get_external_property('foobar', 'foo') ``` -where `foobar` is the property name, and the optional `foo` is the fallback string value.
\ No newline at end of file +where `foobar` is the property name, and the optional `foo` is the fallback string value. + +For cross-compiled projects, `get_external_property()` reads the cross-file unless `native: true` is specified.
\ No newline at end of file |