From 5cbc8f866c78b6d408e8a23c531d3c03ca38f1c7 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Sat, 26 Dec 2020 11:25:44 +0100 Subject: cmake: fix -framework dependencies (fixes #8045) --- mesonbuild/cmake/interpreter.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'mesonbuild') diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 4fac7b1..d4f7fba 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -502,6 +502,20 @@ class ConverterTarget: self.link_libraries = [x for x in self.link_libraries if x.lower() not in blacklist_link_libs] self.link_flags = [x for x in self.link_flags if check_flag(x)] + # Handle OSX frameworks + def handle_frameworks(flags: T.List[str]) -> T.List[str]: + res: T.List[str] = [] + for i in flags: + p = Path(i) + if not p.exists() or not p.name.endswith('.framework'): + res += [i] + continue + res += ['-framework', p.stem] + return res + + self.link_libraries = handle_frameworks(self.link_libraries) + self.link_flags = handle_frameworks(self.link_flags) + # Handle explicit CMake add_dependency() calls for i in self.depends_raw: dep_tgt = output_target_map.target(i) -- cgit v1.1