diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-10 03:38:04 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-10 03:38:04 +0530 |
| commit | 878b0f1401dedce78a13faea1712572ce9854e7f (patch) | |
| tree | fd96b97e88fd07f4ef5db46acace80a07cb3a072 | |
| parent | 4c6f99a31adef341a5d71af28ce26452e4a5f182 (diff) | |
| download | meson-878b0f1401dedce78a13faea1712572ce9854e7f.zip meson-878b0f1401dedce78a13faea1712572ce9854e7f.tar.gz meson-878b0f1401dedce78a13faea1712572ce9854e7f.tar.bz2 | |
Fix shared module installation directory on Windows
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 4c87951..ec6d050 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -643,6 +643,8 @@ int dummy; # we want this specific output out of many outputs to not # be installed. custom_install_dir = True + elif isinstance(t, build.SharedModule): + outdirs[0] = self.environment.get_shared_module_dir() elif isinstance(t, build.SharedLibrary): outdirs[0] = self.environment.get_shared_lib_dir() elif isinstance(t, build.StaticLibrary): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 7861612..93a41e8 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -741,6 +741,10 @@ class Environment: "Install dir for the import library (library used for linking)" return self.get_libdir() + def get_shared_module_dir(self): + "Install dir for shared modules that are loaded at runtime" + return self.get_libdir() + def get_shared_lib_dir(self): "Install dir for the shared library" if self.win_libdir_layout: |