diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-26 10:52:17 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-26 10:39:40 +0000 |
| commit | 060784c981557aaf289631111c47e38c46b934d3 (patch) | |
| tree | cd0442e4abf3075094aa9008ef9cac28801ff31a | |
| parent | 4260b1edc5f99b26e4ca159477471786402c4a04 (diff) | |
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 <alexandru.croitor@qt.io>
| -rwxr-xr-x | util/cmake/pro2cmake.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index c72e27b9cf..3a17ea05d9 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') |