[develop2] Fix MesonToolchain wrong cppstd in apple-clang (#13172)

conan-io · Feb 20, 2023 · 0a7cb6f · 0a7cb6f
1 parent 3956d47
commit 0a7cb6f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/conan/tools/meson/helpers.py b/conan/tools/meson/helpers.py
@@ -53,8 +53,11 @@
     '20': "vc++latest"
 }
 
+# Meson valid values
+# "none", "c++98", "c++03", "c++11", "c++14", "c++17", "c++1z", "c++2a", "c++20",
+# "gnu++11", "gnu++14", "gnu++17", "gnu++1z", "gnu++2a", "gnu++20"
 _cppstd_map = {
-    '98': "c++03", 'gnu98': "gnu++03",
+    '98': "c++98", 'gnu98': "c++98",
     '11': "c++11", 'gnu11': "gnu++11",
     '14': "c++14", 'gnu14': "gnu++14",
     '17': "c++17", 'gnu17': "gnu++17",

diff --git a/conans/test/unittests/model/version/test_version_range.py b/conans/test/unittests/model/version/test_version_range.py
@@ -52,7 +52,8 @@ def test_range(version_range, conditions, versions_in, versions_out):
     for v in versions_out:
         assert Version(v) not in r
 
+
 def test_wrong_range_syntax():
     # https://github.com/conan-io/conan/issues/12692
-    with pytest.raises(ConanException) as e:
+    with pytest.raises(ConanException):
         VersionRange(">= 1.0")