diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-02-21 14:50:50 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-06 18:22:26 +0200 |
| commit | a9a3b3ffe6bb13d03799070ef551c56645f51527 (patch) | |
| tree | 81ad2ed92e9324653cbf1040b3bdc30e1aac7951 /mesonbuild/wrap/wrap.py | |
| parent | 09a722c4bd6bf3014190ecc4d91eee1110affd99 (diff) | |
| download | meson-a9a3b3ffe6bb13d03799070ef551c56645f51527.zip meson-a9a3b3ffe6bb13d03799070ef551c56645f51527.tar.gz meson-a9a3b3ffe6bb13d03799070ef551c56645f51527.tar.bz2 | |
Added method kwarg to subproject
Diffstat (limited to 'mesonbuild/wrap/wrap.py')
| -rw-r--r-- | mesonbuild/wrap/wrap.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index 3eb68a7..47db985 100644 --- a/mesonbuild/wrap/wrap.py +++ b/mesonbuild/wrap/wrap.py @@ -123,9 +123,10 @@ class Resolver: raise WrapException('Directory key must be a name and not a path') self.dirname = os.path.join(self.subdir_root, self.directory) meson_file = os.path.join(self.dirname, 'meson.build') + cmake_file = os.path.join(self.dirname, 'CMakeLists.txt') # The directory is there and has meson.build? Great, use it. - if os.path.exists(meson_file): + if os.path.exists(meson_file) or os.path.exists(cmake_file): return self.directory # Check if the subproject is a git submodule |