Fix up android architecture suffixing
Don't globally map any variable use of QT_ARCH to ANDROID_ABI, as that'll break if somebody uses it in a different context. Instead the CMAKE_SYSTEM_PROCESSOR variable provides a reasonable value and it is also set by the Android toolchain files. Change-Id: Ibf203c39db586bbec5b800a365d83b3a509dbb62 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
b2662b05dd
commit
dcb1253d93
@ -315,7 +315,7 @@ extend_target(Core CONDITION ANDROID
|
||||
kernel/qsharedmemory_android.cpp
|
||||
kernel/qsystemsemaphore_android.cpp
|
||||
DEFINES
|
||||
LIBS_SUFFIX='\\"_${ANDROID_ABI}.so\\"'
|
||||
LIBS_SUFFIX='\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\"'
|
||||
)
|
||||
|
||||
extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
|
||||
@ -431,7 +431,7 @@ extend_target(Core CONDITION INTEGRITY
|
||||
#### Keys ignored in scope 21:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
|
||||
# f16c_cxx = "false"
|
||||
|
||||
#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
|
||||
#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND TEST_architecture_arch STREQUAL x86imdAlways:
|
||||
# f16c_cxx = "true"
|
||||
|
||||
#### Keys ignored in scope 25:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
|
||||
|
@ -399,7 +399,7 @@ extend_target(Core CONDITION ANDROID
|
||||
kernel/qsharedmemory_android.cpp
|
||||
kernel/qsystemsemaphore_android.cpp
|
||||
DEFINES
|
||||
LIBS_SUFFIX="\\\\"_${ANDROID_ABI}.so\\\\"" # special case
|
||||
LIBS_SUFFIX="\\\\"_${CMAKE_SYSTEM_PROCESSOR}.so\\\\"" # special case
|
||||
)
|
||||
|
||||
extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
|
||||
@ -514,7 +514,7 @@ extend_target(Core CONDITION INTEGRITY
|
||||
#### Keys ignored in scope 21:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
|
||||
# f16c_cxx = "false"
|
||||
|
||||
#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
|
||||
#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND TEST_architecture_arch STREQUAL x86imdAlways:
|
||||
# f16c_cxx = "true"
|
||||
|
||||
#### Keys ignored in scope 25:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
|
||||
|
@ -1013,7 +1013,7 @@ class Scope(object):
|
||||
return ["${CMAKE_CURRENT_SOURCE_DIR}/" + project_relative_path]
|
||||
|
||||
if key == "QT_ARCH":
|
||||
return ["${ANDROID_ABI}"]
|
||||
return ["${CMAKE_SYSTEM_PROCESSOR}"]
|
||||
|
||||
if key == "_PRO_FILE_PWD_":
|
||||
return ["${CMAKE_CURRENT_SOURCE_DIR}"]
|
||||
|
Loading…
x
Reference in New Issue
Block a user