diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-10-24 11:10:26 -0700 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-30 21:17:20 +0200 |
| commit | 3bd31cc4d2ff02c2d3c3db80ade7badab08f3e93 (patch) | |
| tree | 35ade9fe5149572f49361cae4faa872c4d82f28d /tools/meson/files | |
| parent | 02026d0a6f2e4b939178219a703158cd7b9d658a (diff) | |
| download | upstream-3bd31cc4d2ff02c2d3c3db80ade7badab08f3e93.tar.gz upstream-3bd31cc4d2ff02c2d3c3db80ade7badab08f3e93.tar.bz2 upstream-3bd31cc4d2ff02c2d3c3db80ade7badab08f3e93.zip | |
tools/meson: update to 0.60.0
Add cmake support to meson. Otherwise only pkgconfig can be used.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'tools/meson/files')
| -rw-r--r-- | tools/meson/files/openwrt-cross.txt.in | 1 | ||||
| -rw-r--r-- | tools/meson/files/openwrt-native.txt.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/meson/files/openwrt-cross.txt.in b/tools/meson/files/openwrt-cross.txt.in index 30b4c116c4..56aa393d63 100644 --- a/tools/meson/files/openwrt-cross.txt.in +++ b/tools/meson/files/openwrt-cross.txt.in @@ -5,6 +5,7 @@ ar = '@AR@' strip = '@STRIP@' nm = '@NM@' pkgconfig = '@PKGCONFIG@' +cmake = '@CMAKE@' [built-in options] c_args = [@CFLAGS@] diff --git a/tools/meson/files/openwrt-native.txt.in b/tools/meson/files/openwrt-native.txt.in index 50308ec8e4..eba63c00b1 100644 --- a/tools/meson/files/openwrt-native.txt.in +++ b/tools/meson/files/openwrt-native.txt.in @@ -2,6 +2,7 @@ c = [@CC@] cpp = [@CXX@] pkgconfig = '@PKGCONFIG@' +cmake = '@CMAKE@' [built-in options] c_args = [@CFLAGS@] |