aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-06-30 13:01:41 -0700
committerDylan Baker <dylan@pnwbakers.com>2021-06-30 14:07:26 -0700
commit4a0a6a80837af1b75db3b3b57a5b8f41386e5c0b (patch)
tree0e06ac4bc30116f30950d60484ba62993cb3a04f /mesonbuild/modules
parent1416ba0b8d950d3263aa35667c659aee18cfa8bf (diff)
downloadmeson-4a0a6a80837af1b75db3b3b57a5b8f41386e5c0b.zip
meson-4a0a6a80837af1b75db3b3b57a5b8f41386e5c0b.tar.gz
meson-4a0a6a80837af1b75db3b3b57a5b8f41386e5c0b.tar.bz2
modules: modules need to return either an ExtensionModlue or a
NewExtensionModule object So that we get the found() method.
Diffstat (limited to 'mesonbuild/modules')
-rw-r--r--mesonbuild/modules/unstable_cuda.py4
-rw-r--r--mesonbuild/modules/unstable_external_project.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/modules/unstable_cuda.py b/mesonbuild/modules/unstable_cuda.py
index a80f9ca..25f953a 100644
--- a/mesonbuild/modules/unstable_cuda.py
+++ b/mesonbuild/modules/unstable_cuda.py
@@ -18,14 +18,14 @@ import re
from ..mesonlib import version_compare
from ..compilers import CudaCompiler, Compiler
-from . import ModuleObject
+from . import NewExtensionModule
from ..interpreterbase import (
flatten, permittedKwargs, noKwargs,
InvalidArguments, FeatureNew
)
-class CudaModule(ModuleObject):
+class CudaModule(NewExtensionModule):
@FeatureNew('CUDA module', '0.50.0')
def __init__(self, *args, **kwargs):
diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py
index 4f8ac56..f866e75 100644
--- a/mesonbuild/modules/unstable_external_project.py
+++ b/mesonbuild/modules/unstable_external_project.py
@@ -16,7 +16,7 @@ import os, subprocess, shlex
from pathlib import Path
import typing as T
-from . import ExtensionModule, ModuleReturnValue, ModuleState, ModuleObject
+from . import ExtensionModule, ModuleReturnValue, ModuleState, NewExtensionModule
from .. import mlog, build
from ..mesonlib import (MesonException, Popen_safe, MachineChoice,
get_variable_regex, do_replacement, extract_as_list)
@@ -26,7 +26,7 @@ from ..compilers.compilers import CFLAGS_MAPPING, CEXE_MAPPING
from ..dependencies import InternalDependency, PkgConfigDependency
from ..mesonlib import OptionKey
-class ExternalProject(ModuleObject):
+class ExternalProject(NewExtensionModule):
def __init__(self,
state: ModuleState,
configure_command: str,