diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-04-10 12:43:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-10 12:43:04 +0300 |
| commit | 7d5e4012fe7d5984d1039d8647a7cb80fe484e9e (patch) | |
| tree | c45078475716cb93716ccf32979a2600eaaffee0 | |
| parent | 27e2c23efc3b3205f97ce44686341f28382b7d72 (diff) | |
| parent | fd030a1efd5e8da01cb3e796089d729505a20039 (diff) | |
| download | meson-7d5e4012fe7d5984d1039d8647a7cb80fe484e9e.zip meson-7d5e4012fe7d5984d1039d8647a7cb80fe484e9e.tar.gz meson-7d5e4012fe7d5984d1039d8647a7cb80fe484e9e.tar.bz2 | |
Merge pull request #1598 from centricular/fix-module-instdir
Fix shared module installation directory on Windows
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 4 | ||||
| -rw-r--r-- | test cases/windows/7 mingw dll versioning/installed_files.txt | 4 |
3 files changed, 8 insertions, 2 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: diff --git a/test cases/windows/7 mingw dll versioning/installed_files.txt b/test cases/windows/7 mingw dll versioning/installed_files.txt index 9acd7db..26e14a7 100644 --- a/test cases/windows/7 mingw dll versioning/installed_files.txt +++ b/test cases/windows/7 mingw dll versioning/installed_files.txt @@ -6,6 +6,6 @@ usr/bin/?libonlyversion-1.dll usr/lib/libonlyversion.dll.a usr/bin/?libonlysoversion-5.dll usr/lib/libonlysoversion.dll.a -usr/libexec/libcustomdir.dll +usr/libexec/?libcustomdir.dll usr/libexec/libcustomdir.dll.a -usr/lib/libmodule.dll +usr/lib/?libmodule.dll |