From 060784c981557aaf289631111c47e38c46b934d3 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Mon, 26 Aug 2019 10:52:17 +0200 Subject: [PATCH] Remove ../ from Targets Remove repeating '../' pattern from target names, since we generate the targets in the correct location with CMake. Change-Id: I89d527a9ad717f742f8d0e5921f378e6ac0a229d Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- util/cmake/pro2cmake.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index c72e27b9cfd..3a17ea05d9f 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -796,8 +796,10 @@ class Scope(object): @property def TARGET(self) -> str: - return self.expandString('TARGET') \ + target = self.expandString('TARGET') \ or os.path.splitext(os.path.basename(self.file))[0] + return re.sub('\.\./', '', target) + @property def _INCLUDED(self) -> typing.List[str]: return self.get('_INCLUDED')