summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-12-11 11:22:05 +0100
committerLeander Beernaert <leander.beernaert@qt.io>2019-12-11 10:37:57 +0000
commit19e79ca0a4655abf580b0bc023b3f1664f7b156b (patch)
tree62f79469b7bb2428782bfbd3d501ab9e42fd0d0a
parent6c20ae774cda49fc233125768b806447669f4265 (diff)
Add condition mapping for cross_compile to CMAKE_CROSS_COMPILING
Change-Id: I90220eda846299c14aca67ba59a2a9518bea2dee Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rwxr-xr-xutil/cmake/pro2cmake.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 7c54e2be2c..f4c9aef9ac 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -1525,6 +1525,8 @@ def map_condition(condition: str) -> str:
)
condition = re.sub(r"styles___contains___fusion", r"QT_FEATURE_style_fusion", condition)
+ condition = condition.replace("cross_compile", "CMAKE_CROSS_COMPILING")
+
cmake_condition = ""
for part in condition.split():
# some features contain e.g. linux, that should not be