From f6d5e8aa4747aabf4c7a9085c24afe1e8761e1e8 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 11 Mar 2021 08:08:50 -0500 Subject: [PATCH] externalproject: Fix error when used from main project --- mesonbuild/modules/unstable_external_project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py index 81539087d..c6fe7e47f 100644 --- a/mesonbuild/modules/unstable_external_project.py +++ b/mesonbuild/modules/unstable_external_project.py @@ -59,13 +59,13 @@ class ExternalProject(InterpreterObject): self.verbose = verbose self.user_env = env - self.name = self.subdir.name self.src_dir = Path(self.env.get_source_dir(), self.subdir) self.build_dir = Path(self.env.get_build_dir(), self.subdir, 'build') self.install_dir = Path(self.env.get_build_dir(), self.subdir, 'dist') self.prefix = Path(self.env.coredata.get_option(OptionKey('prefix'))) self.libdir = Path(self.env.coredata.get_option(OptionKey('libdir'))) self.includedir = Path(self.env.coredata.get_option(OptionKey('includedir'))) + self.name = self.src_dir.name # On Windows if the prefix is "c:/foo" and DESTDIR is "c:/bar", `make` # will install files into "c:/bar/c:/foo" which is an invalid path.