diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-06-11 10:30:53 -0700 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-06-12 15:51:21 +0000 |
| commit | 49a974213c998937bcefe43622bb24d84666c4f2 (patch) | |
| tree | a899daf9437b95e259f0179127dc8143883e916a /mesonbuild/modules/cmake.py | |
| parent | 0332d7e35006afa78afb5e4b4f4d2ecf9a7ded27 (diff) | |
| download | meson-49a974213c998937bcefe43622bb24d84666c4f2.zip meson-49a974213c998937bcefe43622bb24d84666c4f2.tar.gz meson-49a974213c998937bcefe43622bb24d84666c4f2.tar.bz2 | |
modules/cmake: Fix setting install_dir
Fixes: #7301
Diffstat (limited to 'mesonbuild/modules/cmake.py')
| -rw-r--r-- | mesonbuild/modules/cmake.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py index 6c4098b..6d91b99 100644 --- a/mesonbuild/modules/cmake.py +++ b/mesonbuild/modules/cmake.py @@ -252,8 +252,7 @@ class CmakeModule(ExtensionModule): (ofile_path, ofile_fname) = os.path.split(os.path.join(state.subdir, '{}Config.cmake'.format(name))) ofile_abs = os.path.join(state.environment.build_dir, ofile_path, ofile_fname) - if 'install_dir' not in kwargs: - install_dir = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'cmake', name) + install_dir = kwargs.get('install_dir', os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'cmake', name)) if not isinstance(install_dir, str): raise mesonlib.MesonException('"install_dir" must be a string.') |