summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorBartlomiej Moskal <bartlomiej.moskal@qt.io>2023-09-26 14:52:55 +0200
committerBartlomiej Moskal <bartlomiej.moskal@qt.io>2023-09-27 16:52:32 +0000
commit882624324204cde47115042c4cb8ab38521bf91e (patch)
tree98a85b40d8b4063f84a257011a9ac2f5d7c682e1 /cmake
parent2ec4170ac9feccb48ab2267911887ea1e2897a3f (diff)
Android: Turn on dynamic openSSL symbol resolving
Set ENABLE_DYNAMIC_RESOLVE_OPENSSL_SYMBOLS variable to True also for Android OS. That will allow to try to turn on DYNAMIC_RESOLVE_OPENSSL_SYMBOLS (for ssl or crypto libs). Task-number: QTBUG-110805 Task-number: QTBUG-114954 Task-number: QTBUG-113980 Pick-to: 6.6 6.5 Change-Id: Ic916b1419cf85425c2c11d24e9f65e70c46e7cd3 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/FindFFmpeg.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
index fb92a9f08..5cb89c424 100644
--- a/cmake/FindFFmpeg.cmake
+++ b/cmake/FindFFmpeg.cmake
@@ -175,7 +175,9 @@ set(FFMPEG_DEFINITIONS "")
set(FFMPEG_LIBRARY_DIRS "")
# Apply dynamic symbols resolve for Linux build only. We might add Android and QNX as well.
-set(ENABLE_DYNAMIC_RESOLVE_OPENSSL_SYMBOLS ${LINUX} CACHE INTERNAL "")
+if (ANDROID OR LINUX)
+ set(ENABLE_DYNAMIC_RESOLVE_OPENSSL_SYMBOLS TRUE CACHE INTERNAL "")
+endif()
set(ENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS ${LINUX} CACHE INTERNAL "")
function(__try_add_dynamic_resolve_dependency dep added)