diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-04 21:57:27 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-07 22:52:54 +0300 |
| commit | 4d986563dc3e9f850015619297dec92a102b6bbc (patch) | |
| tree | 66d37ba1f4da4ae83ad93795820d95e642b41861 /mesonbuild/interpreter.py | |
| parent | 24ea95abb1b770b296bdf591bb2eb5e53715fa35 (diff) | |
| download | meson-4d986563dc3e9f850015619297dec92a102b6bbc.zip meson-4d986563dc3e9f850015619297dec92a102b6bbc.tar.gz meson-4d986563dc3e9f850015619297dec92a102b6bbc.tar.bz2 | |
Expose wrap_mode as an option. Closes #4266.
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 f2b8f34..2d5dd92 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2265,7 +2265,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: @@ -2940,7 +2940,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 != '': @@ -3007,12 +3007,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: |