diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-04 21:57:27 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-04 21:57:27 +0300 |
| commit | 106608bdc2b777ed0483ac0db4c6bc72c1054295 (patch) | |
| tree | 51e50292798be002f1a48ab7edd65e5a0099a60c /mesonbuild/interpreter.py | |
| parent | c0c075c1298ad9018a62d75a632af1c0d0d7d0f8 (diff) | |
| download | meson-exposewrap.tar.gz | |
Expose wrap_mode as an option. Closes #4266.exposewrap
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index a4d947221..47daf8d8f 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2315,7 +2315,7 @@ external dependencies (including libraries) must go to "dependencies".''') return subproject subproject_dir_abs = os.path.join(self.environment.get_source_dir(), self.subproject_dir) - r = wrap.Resolver(subproject_dir_abs, self.coredata.wrap_mode) + r = wrap.Resolver(subproject_dir_abs, self.coredata.get_builtin_option('wrap_mode')) try: resolved = r.resolve(dirname) except RuntimeError as e: @@ -2992,7 +2992,7 @@ external dependencies (including libraries) must go to "dependencies".''') dep = NotFoundDependency(self.environment) # Unless a fallback exists and is forced ... - if self.coredata.wrap_mode == WrapMode.forcefallback and 'fallback' in kwargs: + if self.coredata.get_builtin_option('wrap_mode') == WrapMode.forcefallback and 'fallback' in kwargs: pass # ... search for it outside the project elif name != '': @@ -3059,12 +3059,12 @@ root and issuing %s. def dependency_fallback(self, name, kwargs): display_name = name if name else '(anonymous)' - if self.coredata.wrap_mode in (WrapMode.nofallback, WrapMode.nodownload): + if self.coredata.get_builtin_option('wrap_mode') in (WrapMode.nofallback, WrapMode.nodownload): mlog.log('Not looking for a fallback subproject for the dependency', mlog.bold(display_name), 'because:\nUse of fallback' 'dependencies is disabled.') return None - elif self.coredata.wrap_mode == WrapMode.forcefallback: + elif self.coredata.get_builtin_option('wrap_mode') == WrapMode.forcefallback: mlog.log('Looking for a fallback subproject for the dependency', mlog.bold(display_name), 'because:\nUse of fallback dependencies is forced.') else: |