diff options
| author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2020-02-05 13:26:35 -0500 |
|---|---|---|
| committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2020-02-05 13:26:35 -0500 |
| commit | a4e4d2e75a25d4254e13ce0d6e3486f87e2d027a (patch) | |
| tree | b598712a61b770a7a44404f2ae441af0ca67127d | |
| parent | 58b1157d879d1ec16b09963a3945e4608d137653 (diff) | |
| download | meson-a4e4d2e75a25d4254e13ce0d6e3486f87e2d027a.zip meson-a4e4d2e75a25d4254e13ce0d6e3486f87e2d027a.tar.gz meson-a4e4d2e75a25d4254e13ce0d6e3486f87e2d027a.tar.bz2 | |
doc
| -rw-r--r-- | docs/markdown/Reference-manual.md | 2 | ||||
| -rw-r--r-- | docs/markdown/snippets/native_property.md | 4 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index 4e59030..f4fa89e 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -1788,7 +1788,7 @@ the following methods. 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. + *(added 0.54.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. diff --git a/docs/markdown/snippets/native_property.md b/docs/markdown/snippets/native_property.md index 3845fa1..d3808d8 100644 --- a/docs/markdown/snippets/native_property.md +++ b/docs/markdown/snippets/native_property.md @@ -1,13 +1,13 @@ ## Native file properties -As of Meson 0.53.0, the `--native-file nativefile.ini` can contain: +As of Meson 0.54.0, the `--native-file nativefile.ini` can contain: * binaries * paths * properties 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: +The `properties` are new for Meson 0.54.0, and are read like: ```meson x = meson.get_external_property('foobar', 'foo') diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index df23b87..74882b2 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2037,8 +2037,8 @@ class MesonMain(InterpreterObject): @noArgsFlattening @permittedKwargs({'native'}) - @FeatureNew('meson.get_external_property', '0.53.0') - def get_external_property_method(self, args: Sequence[str], kwargs: dict) -> str: + @FeatureNew('meson.get_external_property', '0.54.0') + def get_external_property_method(self, args: T.Sequence[str], kwargs: dict) -> str: if len(args) < 1 or len(args) > 2: raise InterpreterException('Must have one or two positional arguments.') propname = args[0] |