diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-03-11 08:11:36 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2021-03-16 18:17:58 -0400 |
| commit | a0689647a9b09544e0ce2b2d3d7e7a4f07f7f2bd (patch) | |
| tree | f19e7aa973dc365d85d986d0c04e0ca11e95601e | |
| parent | f6d5e8aa4747aabf4c7a9085c24afe1e8761e1e8 (diff) | |
| download | meson-a0689647a9b09544e0ce2b2d3d7e7a4f07f7f2bd.zip meson-a0689647a9b09544e0ce2b2d3d7e7a4f07f7f2bd.tar.gz meson-a0689647a9b09544e0ce2b2d3d7e7a4f07f7f2bd.tar.bz2 | |
externalproject: Do not add --includedir by default
Some projects (e.g. OpenSSL) does not support setting include directory
at all.
| -rw-r--r-- | mesonbuild/modules/unstable_external_project.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/modules/unstable_external_project.py b/mesonbuild/modules/unstable_external_project.py index c6fe7e4..faa1285 100644 --- a/mesonbuild/modules/unstable_external_project.py +++ b/mesonbuild/modules/unstable_external_project.py @@ -92,7 +92,7 @@ class ExternalProject(InterpreterObject): d = [('PREFIX', '--prefix=@PREFIX@', self.prefix.as_posix()), ('LIBDIR', '--libdir=@PREFIX@/@LIBDIR@', self.libdir.as_posix()), - ('INCLUDEDIR', '--includedir=@PREFIX@/@INCLUDEDIR@', self.includedir.as_posix()), + ('INCLUDEDIR', None, self.includedir.as_posix()), ] self._validate_configure_options(d) @@ -140,6 +140,8 @@ class ExternalProject(InterpreterObject): # Ensure the user at least try to pass basic info to the build system, # like the prefix, libdir, etc. for key, default, val in variables: + if default is None: + continue key_format = f'@{key}@' for option in self.configure_options: if key_format in option: |