aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/cmake/interpreter.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-10-03 18:17:09 +0200
committerDaniel Mensinger <daniel@mensinger-ka.de>2019-10-03 18:17:09 +0200
commit4185a000578a8f51ab8d2358c4bf2f93fd507d85 (patch)
treec38751752428fa8c8f69543b98794446abc9f7a7 /mesonbuild/cmake/interpreter.py
parentb0d35ec3496064c4ce13fa7b8f3346670a67c0fe (diff)
downloadmeson-4185a000578a8f51ab8d2358c4bf2f93fd507d85.zip
meson-4185a000578a8f51ab8d2358c4bf2f93fd507d85.tar.gz
meson-4185a000578a8f51ab8d2358c4bf2f93fd507d85.tar.bz2
Revert "cmake: postprocess libraries names with so version"
This reverts commit 73f006149823a498f88e0131f963a0ff81043788.
Diffstat (limited to 'mesonbuild/cmake/interpreter.py')
-rw-r--r--mesonbuild/cmake/interpreter.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py
index 3e94933..09ac7c6 100644
--- a/mesonbuild/cmake/interpreter.py
+++ b/mesonbuild/cmake/interpreter.py
@@ -602,14 +602,9 @@ class CMakeInterpreter:
# generate the output_target_map
output_target_map = {}
+ output_target_map.update({x.full_name: x for x in self.targets})
+ output_target_map.update({_target_key(x.name): x for x in self.targets})
for i in self.targets:
- output_target_map[i.full_name] = i
- output_target_map[_target_key(i.name)] = i
- ttarget = self.trace.targets.get(i.name)
- soversion = ttarget.properties.get('SOVERSION') if ttarget else None
- if soversion:
- k = '{}.{}'.format(i.full_name, soversion[0])
- output_target_map[k] = i
for j in i.artifacts:
output_target_map[os.path.basename(j)] = i
for i in self.custom_targets: