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

CMake: Port the 'cross_compile' feature

Browse Source 
Change-Id: Iccd1d55e95797740a4a8689462ce9ab1e49a62c1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-04-16 22:33:14 +02:00
parent 2e89c61f58
commit 9b45ca7411
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.cmake
View File

@ -330,6 +330,12 @@ qt_feature("static" PUBLIC
)
qt_feature_config("static" QMAKE_PUBLIC_QT_CONFIG)
qt_feature_config("static" QMAKE_PUBLIC_CONFIG)
qt_feature("cross_compile" PUBLIC
LABEL "Cross compiling"
CONDITION CMAKE_CROSSCOMPILING
)
qt_feature_config("cross_compile" QMAKE_PUBLIC_CONFIG)
qt_feature_config("cross_compile" QMAKE_PRIVATE_CONFIG)
qt_feature("use_bfd_linker"
LABEL "bfd"
AUTODETECT false

2
util/cmake/configurejson2cmake.py
View File

@ -821,7 +821,7 @@ def get_feature_mapping():
"build_all": None,
"ccache": None,
"compiler-flags": None,
"cross_compile": None,
"cross_compile": {"condition": "CMAKE_CROSSCOMPILING"},
"debug_and_release": {
"autoDetect": "1", # Setting this to None has weird effects...
"condition": "QT_GENERATOR_IS_MULTI_CONFIG",