From 878b0f1401dedce78a13faea1712572ce9854e7f Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 10 Apr 2017 03:38:04 +0530 Subject: [PATCH 1/2] Fix shared module installation directory on Windows --- mesonbuild/backend/ninjabackend.py | 2 ++ mesonbuild/environment.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 4c8795134..ec6d05025 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 7861612eb..93a41e860 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: From fd030a1efd5e8da01cb3e796089d729505a20039 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 10 Apr 2017 04:47:02 +0530 Subject: [PATCH 2/2] tests/windows/7: Fix test on Cygwin Not sure how this was missed. --- test cases/windows/7 mingw dll versioning/installed_files.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9acd7dbee..26e14a7d8 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