diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-07-17 19:21:05 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-07-23 05:50:55 +0000 |
| commit | e2499fab8b27547c54adb5dd501b2a7a7ddd0f0d (patch) | |
| tree | f319de6e9c8449b3c3cebd130b54b1e0ce2bda6e | |
| parent | 9c2724bce5c6a904d1bffdb55921071163812a0e (diff) | |
| download | meson-e2499fab8b27547c54adb5dd501b2a7a7ddd0f0d.zip meson-e2499fab8b27547c54adb5dd501b2a7a7ddd0f0d.tar.gz meson-e2499fab8b27547c54adb5dd501b2a7a7ddd0f0d.tar.bz2 | |
meson: Use CMAKE_PREFIX_PATH environment variable
| -rw-r--r-- | mesonbuild/dependencies/base.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 0e6a601..22f4c6f 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1035,6 +1035,12 @@ class CMakeDependency(ExternalDependency): cm_args.append('-DCMAKE_MODULE_PATH=' + ';'.join(cm_path)) pref_path = self.env.coredata.builtins_per_machine[self.for_machine]['cmake_prefix_path'].value + if 'CMAKE_PREFIX_PATH' in os.environ: + env_pref_path = os.environ['CMAKE_PREFIX_PATH'].split(':') + env_pref_path = [x for x in env_pref_path if x] # Filter out enpty strings + if not pref_path: + pref_path = [] + pref_path += env_pref_path if pref_path: cm_args.append('-DCMAKE_PREFIX_PATH={}'.format(';'.join(pref_path))) |