aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2021-03-11 08:08:50 -0500
committerXavier Claessens <xclaesse@gmail.com>2021-03-16 18:17:58 -0400
commitf6d5e8aa4747aabf4c7a9085c24afe1e8761e1e8 (patch)
treefd6dfeb6ff526b2d3a654dcc38e7985c47f7000e
parentcb96e79c1570f4e0abc0d115682dd43922a5c0ca (diff)
downloadmeson-f6d5e8aa4747aabf4c7a9085c24afe1e8761e1e8.zip
meson-f6d5e8aa4747aabf4c7a9085c24afe1e8761e1e8.tar.gz
meson-f6d5e8aa4747aabf4c7a9085c24afe1e8761e1e8.tar.bz2
externalproject: Fix error when used from main project
-rw-r--r--mesonbuild/modules/unstable_external_project.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py
index 8153908..c6fe7e4 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.