aboutsummaryrefslogtreecommitdiff
path: root/build.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-03-09 19:39:12 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-03-09 19:39:12 +0200
commit48477102c9791ba35b61e5fc76b2e615df9bbd44 (patch)
treec8a5d3db744e584dc3ed2338c363c2b710d326fc /build.py
parent6e6ac02eaf265c6688c528175bce71ea45549ca7 (diff)
downloadmeson-48477102c9791ba35b61e5fc76b2e615df9bbd44.zip
meson-48477102c9791ba35b61e5fc76b2e615df9bbd44.tar.gz
meson-48477102c9791ba35b61e5fc76b2e615df9bbd44.tar.bz2
Now can compile all Qt5 tests with module.
Diffstat (limited to 'build.py')
-rw-r--r--build.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/build.py b/build.py
index 5163d24..4072102 100644
--- a/build.py
+++ b/build.py
@@ -492,13 +492,12 @@ class Generator():
def __init__(self, args, kwargs):
if len(args) != 1:
raise InvalidArguments('Generator requires one and only one positional argument')
-
- if hasattr(args[0], 'held_object'):
- exe = args[0].held_object
- if not isinstance(exe, Executable) and not isinstance(exe, dependencies.ExternalProgram):
- raise InvalidArguments('First generator argument must be an executable.')
- else:
- raise InvalidArguments('First generator argument must be an executable object.')
+
+ exe = args[0]
+ if hasattr(exe, 'held_object'):
+ exe = exe.held_object
+ if not isinstance(exe, Executable) and not isinstance(exe, dependencies.ExternalProgram):
+ raise InvalidArguments('First generator argument must be an executable.')
self.exe = exe
self.process_kwargs(kwargs)