From f2114fa167363925791e8f10cfc793b3bc317690 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Wed, 20 Nov 2019 20:50:25 +0100 Subject: [PATCH] cmake: add_custom_command fix empty and quoted parameters --- mesonbuild/cmake/data/run_ctgt.py | 1 + mesonbuild/cmake/interpreter.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/mesonbuild/cmake/data/run_ctgt.py b/mesonbuild/cmake/data/run_ctgt.py index 4e85b8656..d4e325922 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 921fa6038..8098bdb9c 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]]