Fix shared module installation directory on Windows

pull/1598/head
Nirbheek Chauhan 8 years ago
parent 4c6f99a31a
commit 878b0f1401
  1. 2
      mesonbuild/backend/ninjabackend.py
  2. 4
      mesonbuild/environment.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):

@ -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:

Loading…
Cancel
Save