Skip to content

Commit baff058

Browse files
committed
Fix handling variant-name without variant
1 parent 0717750 commit baff058

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mesonpy/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import pyproject_metadata
4646

4747
from variantlib.meta import VariantMeta, VariantDescription
48+
from variantlib.plugins import PluginLoader
4849

4950
import mesonpy._compat
5051
import mesonpy._rpath
@@ -1055,9 +1056,8 @@ def _project(config_settings: Optional[Dict[Any, Any]] = None) -> Iterator[Proje
10551056
variants = settings.get('variant', [])
10561057
variant_names = settings.get('variant-name', []) + variants
10571058

1058-
variant_desc = None
1059+
variant_desc = VariantDescription(variant_names) if variant_names else None
10591060
if variants:
1060-
variant_desc = VariantDescription(variant_names)
10611061
meson_args.setdefault('setup', [])
10621062
meson_args['setup'].append(f'-Dvariant={[x.to_str() for x in variants]!r}')
10631063

0 commit comments

Comments
 (0)