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

pro2cmake: Handle VPATH

Browse Source 
Change-Id: Ia72f55489129c50ca730c42b75bbc2bda926b82f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tobias Hunger 2018-12-20 10:41:56 +01:00
parent 99315c2129
commit f0aa8fa48e
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/cmake/pro2cmake.py
View File

@ -81,7 +81,7 @@ def map_to_file(f: str, top_dir: str, current_dir: str,
return f return f
def map_source_to_cmake(source: str) -> typing.Optional[str]: def map_source_to_cmake(source: str, base_dir: str, vpath: List[str]) -> typing.Optional[str]:
if not source or source == '$$NO_PCH_SOURCES': if not source or source == '$$NO_PCH_SOURCES':
return None return None
if source.startswith('$$PWD/'): if source.startswith('$$PWD/'):
@ -90,9 +90,21 @@ def map_source_to_cmake(source: str) -> typing.Optional[str]:
return "${CMAKE_CURRENT_SOURCE_DIR}" return "${CMAKE_CURRENT_SOURCE_DIR}"
if source.startswith('$$QT_SOURCE_TREE/'): if source.startswith('$$QT_SOURCE_TREE/'):
return "${PROJECT_SOURCE_DIR}/" + source[17:] return "${PROJECT_SOURCE_DIR}/" + source[17:]
if os.path.exists(os.path.join(base_dir, source)):
return source return source
for v in vpath:
fullpath = os.path.join(v, source)
if os.path.exists(fullpath):
relpath = os.path.relpath(fullpath, base_dir)
return relpath
print(' XXXX: Source {}: Not found.'.format(source))
return '{}-NOTFOUND'.format(source)
def map_source_to_fs(base_dir: str, file: str, source: str) -> typing.Optional[str]: def map_source_to_fs(base_dir: str, file: str, source: str) -> typing.Optional[str]:
if source is None or source == '$$NO_PCH_SOURCES': if source is None or source == '$$NO_PCH_SOURCES':
return None return None
@ -492,7 +504,9 @@ def write_sources_section(cm_fh: IO[str], scope: Scope, *, indent: int=0,
else: else:
sources += resources sources += resources
sources = [map_source_to_cmake(s) for s in sources] vpath = scope.get('VPATH')
sources = [map_source_to_cmake(s, scope.basedir(), vpath) for s in sources]
if sources: if sources:
cm_fh.write('{} SOURCES\n'.format(ind)) cm_fh.write('{} SOURCES\n'.format(ind))
for l in sort_sources(sources): for l in sort_sources(sources):