summaryrefslogtreecommitdiffstats
path: root/src/core/api/configure.cmake
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2021-07-06 07:57:46 +0200
committerMichal Klocek <michal.klocek@qt.io>2021-07-07 01:04:18 +0200
commitb1a6adf731828b1f68f51480eeb21dd9e7d3ba1e (patch)
treead24c582e89bc4a19a3431dbd130feed5817c698 /src/core/api/configure.cmake
parent05a7dba5c2733b5893fbea8aac89af5df13d53fb (diff)
Add arm optimization flags to cmake build
Pick-to: dev Change-Id: Ibab4630fd226f46f58d08c603436dc2c378212ec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/api/configure.cmake')
-rw-r--r--src/core/api/configure.cmake16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake
index c8518f6ee..970b8a762 100644
--- a/src/core/api/configure.cmake
+++ b/src/core/api/configure.cmake
@@ -145,11 +145,17 @@ qt_configure_add_summary_entry(
CONDITION UNIX
)
qt_configure_end_summary_section() # end of "Qt WebEngineCore" section
-#qt_configure_add_report_entry(
-# TYPE WARNING
-# MESSAGE "Thumb instruction set is required to build ffmpeg for QtWebEngine."
-# CONDITION LINUX AND QT_FEATURE_webengine_embedded_build AND NOT QT_FEATURE_webengine_system_ffmpeg AND ( TEST_architecture_arch STREQUAL arm ) AND NOT QT_FEATURE_webengine_arm_thumb
-#)
+if(CMAKE_CROSSCOMPILING)
+ check_thumb(armThumb)
+ qt_configure_add_report_entry(
+ TYPE WARNING
+ MESSAGE "Thumb instruction set is required to build ffmpeg for QtWebEngine."
+ CONDITION LINUX
+ AND NOT QT_FEATURE_webengine_system_ffmpeg
+ AND TEST_architecture_arch MATCHES arm
+ AND NOT armThumb
+ )
+endif()
qt_configure_add_report_entry(
TYPE WARNING
MESSAGE "V8 snapshot cannot be built. Most likely, the 32-bit host compiler does not work. Please make sure you have 32-bit devel environment installed."