From 6813ef1e2424cdcfc0811bb0c7b3d2efc996fd36 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 12 Jul 2019 21:54:09 -0400 Subject: cmake: Handle disabling subprojects --- mesonbuild/modules/cmake.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mesonbuild/modules/cmake.py') diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py index a36d748..3a01636 100644 --- a/mesonbuild/modules/cmake.py +++ b/mesonbuild/modules/cmake.py @@ -274,7 +274,10 @@ class CmakeModule(ExtensionModule): if len(args) != 1: raise InterpreterException('Subproject takes exactly one argument') dirname = args[0] - return CMakeSubprojectHolder(interpreter.do_subproject(dirname, 'cmake', kwargs), dirname) + subp = interpreter.do_subproject(dirname, 'cmake', kwargs) + if not subp.held_object: + return subp + return CMakeSubprojectHolder(subp, dirname) def initialize(*args, **kwargs): return CmakeModule(*args, **kwargs) -- cgit v1.1