diff options
| author | Daniel Stone <daniels@collabora.com> | 2020-04-15 12:27:41 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2020-04-15 21:18:26 +0100 |
| commit | 98e5e1ddc5f7f75eea7622dbdbd67bada1cd00ef (patch) | |
| tree | 56bb3c98f167fc9aa22cf8837e5c7bddf933f955 | |
| parent | 1d7d9c88e8bc3c17ea7f18e02ca30635212b9384 (diff) | |
| download | meson-98e5e1ddc5f7f75eea7622dbdbd67bada1cd00ef.zip meson-98e5e1ddc5f7f75eea7622dbdbd67bada1cd00ef.tar.gz meson-98e5e1ddc5f7f75eea7622dbdbd67bada1cd00ef.tar.bz2 | |
dependencies/cmake: Add Windows/VS library regex
When finding dependencies from CMake, use a smarter regex to determine
whether or not a dependency is actually a link argument, and pass
through Windows link arguments properly.
| -rw-r--r-- | mesonbuild/dependencies/base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 50f4179..068e45e 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1411,7 +1411,8 @@ class CMakeDependency(ExternalDependency): 'Valid targets are:\n{}'.format(name, list(self.traceparser.targets.keys()))) # Set dependencies with CMake targets - reg_is_lib = re.compile(r'^(-l[a-zA-Z0-9_]+|-pthread)$') + # recognise arguments we should pass directly to the linker + reg_is_lib = re.compile(r'^(-l[a-zA-Z0-9_]+|-pthread|-delayload:[a-zA-Z0-9_\.]+|[a-zA-Z0-9_]+\.lib)$') processed_targets = [] incDirs = [] compileDefinitions = [] |