diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-11-20 20:50:25 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-11-20 20:58:38 +0100 |
| commit | f2114fa167363925791e8f10cfc793b3bc317690 (patch) | |
| tree | 462e5731ea2b1b92859e12ca3c69705148f5ab89 | |
| parent | 7e839fc4a94962940ce941a9aad00f571ff3d4c9 (diff) | |
| download | meson-f2114fa167363925791e8f10cfc793b3bc317690.zip meson-f2114fa167363925791e8f10cfc793b3bc317690.tar.gz meson-f2114fa167363925791e8f10cfc793b3bc317690.tar.bz2 | |
cmake: add_custom_command fix empty and quoted parameters
| -rwxr-xr-x | mesonbuild/cmake/data/run_ctgt.py | 1 | ||||
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/cmake/data/run_ctgt.py b/mesonbuild/cmake/data/run_ctgt.py index 4e85b86..d4e3259 100755 --- a/mesonbuild/cmake/data/run_ctgt.py +++ b/mesonbuild/cmake/data/run_ctgt.py @@ -28,6 +28,7 @@ for i in args.commands: commands += [[]] continue + i = i.replace('"', '') # Remove lefover quotes commands[-1] += [i] # Execute diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 921fa60..8098bdb 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -461,6 +461,8 @@ class ConverterCustomTarget: cmd = [] for j in i: + if not j: + continue target_key = _target_key(j) if target_key in output_target_map: cmd += [output_target_map[target_key]] |