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 /include | |
| 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 'include')
| -rw-r--r-- | include/meson.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/meson.mk b/include/meson.mk index 12e38b9e71..ae17e18d2d 100644 --- a/include/meson.mk +++ b/include/meson.mk @@ -64,6 +64,7 @@ define Meson/CreateNativeFile -e "s|@CC@|$(foreach BIN,$(HOSTCC),'$(BIN)',)|" \ -e "s|@CXX@|$(foreach BIN,$(HOSTCXX),'$(BIN)',)|" \ -e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \ + -e "s|@CMAKE@|$(STAGING_DIR_HOST)/bin/cmake|" \ -e "s|@CFLAGS@|$(foreach FLAG,$(HOST_CFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \ -e "s|@CXXFLAGS@|$(foreach FLAG,$(HOST_CXXFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \ -e "s|@LDFLAGS@|$(foreach FLAG,$(HOST_LDFLAGS),'$(FLAG)',)|" \ @@ -80,6 +81,7 @@ define Meson/CreateCrossFile -e "s|@STRIP@|$(TARGET_CROSS)strip|" \ -e "s|@NM@|$(TARGET_NM)|" \ -e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \ + -e "s|@CMAKE@|$(STAGING_DIR_HOST)/bin/cmake|" \ -e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \ -e "s|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \ -e "s|@LDFLAGS@|$(foreach FLAG,$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS),'$(FLAG)',)|" \ |