From 3dea817a597e4d2f10bfe3c1e006a0983555ad15 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Fri, 24 Jul 2020 15:52:06 +0200 Subject: Only emit warning about "native:" on projects with minimum required version 'native:' keyword was only added in 0.54. For projects declaring meson_version >= 0.54, warn, because those projects can and should set the keyword. For older projects declaring support for older versions, don't warn and use the default implicitly. Fixes https://github.com/mesonbuild/meson/issues/6849. --- test cases/warning/2 languages missing native/meson.build | 3 ++- test cases/warning/2 languages missing native/test.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'test cases') diff --git a/test cases/warning/2 languages missing native/meson.build b/test cases/warning/2 languages missing native/meson.build index f4aa9567a..e2047152b 100644 --- a/test cases/warning/2 languages missing native/meson.build +++ b/test cases/warning/2 languages missing native/meson.build @@ -1,2 +1,3 @@ -project('languages missing native') +project('languages missing native', + meson_version : '>= 0.54') add_languages('c') diff --git a/test cases/warning/2 languages missing native/test.json b/test cases/warning/2 languages missing native/test.json index 36da0a75b..f929654d8 100644 --- a/test cases/warning/2 languages missing native/test.json +++ b/test cases/warning/2 languages missing native/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/warning/2 languages missing native/meson.build:2: WARNING: add_languages is missing native:, assuming languages are wanted for both host and build." + "line": "test cases/warning/2 languages missing native/meson.build:3: WARNING: add_languages is missing native:, assuming languages are wanted for both host and build." } ] } -- cgit v1.2.3