diff options
| author | Bartlomiej Moskal <bartlomiej.moskal@qt.io> | 2023-09-26 14:52:55 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-27 20:04:51 +0000 |
| commit | f094f638caa295fbaa9e45c9a9213cf1faf91916 (patch) | |
| tree | e5d62d8260ca0099744d58c822f460e3e28ed16e | |
| parent | 69cf4bd6f31dae0ec0f2afeb8f625d029f5b79e8 (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
Change-Id: Ic916b1419cf85425c2c11d24e9f65e70c46e7cd3
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 882624324204cde47115042c4cb8ab38521bf91e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 0dfab726bad8e697d631f148b57ff9b94cc847bc)
| -rw-r--r-- | cmake/FindFFmpeg.cmake | 4 |
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) |