AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: pro2cmake.py: Remove leading ./ in paths

Browse Source 
Remove leading './' from paths before writing them into CMakeLists.txt.

Change-Id: I5680a3470cf491a8805b559197f94f8e6a6ce9b7
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
This commit is contained in:
Tobias Hunger 2019-02-07 15:26:31 +01:00
parent 64e3c8bb19
commit 6104643db0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/cmake/pro2cmake.py
View File

@ -86,7 +86,7 @@ def map_to_file(f: str, top_dir: str, current_dir: str,
if f.startswith('$$QT_SOURCE_TREE'): if f.startswith('$$QT_SOURCE_TREE'):
return "${PROJECT_SOURCE_DIR}/" + f[17:] return "${PROJECT_SOURCE_DIR}/" + f[17:]
if f.startswith("./"): if f.startswith("./"):
return os.path.join(current_dir, f) return os.path.join(current_dir, f) if current_dir != '.' else f[2:]
if want_absolute_path and not os.path.isabs(f): if want_absolute_path and not os.path.isabs(f):
return os.path.join(current_dir, f) return os.path.join(current_dir, f)
return f return f
@ -98,6 +98,8 @@ def map_source_to_cmake(source: str, base_dir: str,
return '' return ''
if source.startswith('$$PWD/'): if source.startswith('$$PWD/'):
return source[6:] return source[6:]
if source.startswith('./'):
return source[2:]
if source == '.': if source == '.':
return "${CMAKE_CURRENT_SOURCE_DIR}" return "${CMAKE_CURRENT_SOURCE_DIR}"
if source.startswith('$$QT_SOURCE_TREE/'): if source.startswith('$$QT_SOURCE_TREE/'):