1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: pro2cmake.py: Fix handling of libraries in QT

Browse Source 
Change-Id: I5737a285ca0575a454e60fad231435d96b2f1be7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tobias Hunger 2019-04-12 11:53:38 +02:00
parent 95cdb0d1ae
commit ce809cab29
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util/cmake/pro2cmake.py
View File

@ -961,17 +961,15 @@ def write_library_section(cm_fh: typing.IO[str], scope: Scope,
if map_qt_library(q) not in known_libraries] if map_qt_library(q) not in known_libraries]
for key in mixed: for key in mixed:
for lib in scope.expand(key): for lib in scope.expand(key):
if map_qt_library(lib) in known_libraries: mapped_lib = map_qt_library(lib)
if mapped_lib in known_libraries:
continue continue
if lib.endswith('-private'): if mapped_lib.endswith('Private'):
mapped_lib_name = map_qt_base_library(lib[0:-8]) private_dependencies.append(mapped_lib)
if mapped_lib_name: public_dependencies.append(mapped_lib[:-7])
private_dependencies.append(mapped_lib_name + 'Private') else:
public_dependencies.append(mapped_lib_name) public_dependencies.append(mapped_lib)
continue
public_dependencies.append(lib)
write_library_list(cm_fh, 'LIBRARIES', private_dependencies, indent=indent) write_library_list(cm_fh, 'LIBRARIES', private_dependencies, indent=indent)
write_library_list(cm_fh, 'PUBLIC_LIBRARIES', public_dependencies, indent=indent) write_library_list(cm_fh, 'PUBLIC_LIBRARIES', public_dependencies, indent=indent)