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

CMake: Fix handling of the CROSSCOMPILING_EMULATOR property

Browse Source 
CROSSCOMPILING_EMULATOR is a target property, not a test property.

Fixes: QTBUG-87864
Pick-to: 6.2 6.3
Change-Id: Icb07e9ed71a6bcbfceb7aa2116bf56eaa0a545c6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2022-03-24 12:05:15 +01:00
parent 862f42e806
commit 02e5b0ffda
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/QtTestHelpers.cmake
View File

@ -516,8 +516,9 @@ for this function. Will be ignored")
# Prepend emulator to test command in generated cmake script instead. Keep in mind that # Prepend emulator to test command in generated cmake script instead. Keep in mind that
# CROSSCOMPILING_EMULATOR don't check if actual cross compilation is configured, # CROSSCOMPILING_EMULATOR don't check if actual cross compilation is configured,
# emulator is prepended independently. # emulator is prepended independently.
if(CMAKE_CROSSCOMPILING) set(crosscompiling_emulator "")
get_test_property(${arg_NAME} CROSSCOMPILING_EMULATOR crosscompiling_emulator) if(CMAKE_CROSSCOMPILING AND TARGET ${arg_NAME})
get_target_property(crosscompiling_emulator ${arg_NAME} CROSSCOMPILING_EMULATOR)
if(NOT crosscompiling_emulator) if(NOT crosscompiling_emulator)
set(crosscompiling_emulator "") set(crosscompiling_emulator "")
else() else()