diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-08 11:28:49 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-09 07:28:18 +0000 |
commit | 52f676bf6602053336dff9bf9b00b40dad14ae4f (patch) | |
tree | 4b717154fd72f9138bd859292cc92d1e54907d87 /util | |
parent | 77a465ea2d9d13c742ca35bd155732fcd8af0972 (diff) |
CMake: pro2cmake.py: Better representation of scopes as str
Include the current directory in the scope __repr__ output to make
it easier to understand where things wrt. include or file names go
wrong.
Change-Id: I09a6c17c6d8d547f1f64801bcde3c2e10c925ee1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'util')
-rwxr-xr-x | util/cmake/pro2cmake.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 0403961cbd..de715bbfef 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -301,8 +301,10 @@ class Scope(object): def __repr__(self): debug_mark = ' [MERGE_DEBUG]' if self.merge_debug else '' - return '{}:{}:{}:{}{}'.format(self._scope_id, self._basedir, self._file, - self._condition or '<NONE>', debug_mark) + return '{}:{}:{}:{}:{}'.format(self._scope_id, + self._basedir, self._currentdir, + self._file, self._condition or '<TRUE>', + debug_mark) def reset_visited_keys(self): self._visited_keys = set() |