aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/cmake/traceparser.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2020-05-31 23:22:30 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2020-06-02 20:47:22 +0300
commita252a17e6e0314c3bd77ef8cd50ada9f53cee678 (patch)
tree5e8147c782a5782637cdc578dfded0e4c334cec6 /mesonbuild/cmake/traceparser.py
parent9ada7e18a898118bcf177ec4d39c677acaee1606 (diff)
downloadmeson-a252a17e6e0314c3bd77ef8cd50ada9f53cee678.zip
meson-a252a17e6e0314c3bd77ef8cd50ada9f53cee678.tar.gz
meson-a252a17e6e0314c3bd77ef8cd50ada9f53cee678.tar.bz2
cmake: always split property lists (fixes #7228)
Diffstat (limited to 'mesonbuild/cmake/traceparser.py')
-rw-r--r--mesonbuild/cmake/traceparser.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/cmake/traceparser.py b/mesonbuild/cmake/traceparser.py
index f20bcc8..d94e774 100644
--- a/mesonbuild/cmake/traceparser.py
+++ b/mesonbuild/cmake/traceparser.py
@@ -64,6 +64,7 @@ class CMakeTarget:
return
for key, val in self.properties.items():
self.properties[key] = [x.strip() for x in val]
+ assert all([';' not in x for x in self.properties[key]])
class CMakeGeneratorTarget(CMakeTarget):
def __init__(self, name):
@@ -574,10 +575,10 @@ class CMakeTraceParser:
continue
if mode in ['INTERFACE', 'LINK_INTERFACE_LIBRARIES', 'PUBLIC', 'LINK_PUBLIC']:
- interface += [i]
+ interface += i.split(';')
if mode in ['PUBLIC', 'PRIVATE', 'LINK_PRIVATE']:
- private += [i]
+ private += i.split(';')
if paths:
interface = self._guess_files(interface)