From b3608700f92fb0f4362371a401ec7f3a774fde37 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 4 Jul 2023 09:07:05 +0200 Subject: [PATCH] Android: Downgrade OpenSSL configure error to warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amend 9d5a8162a5a168972c7aaf39b130da6a72dc13e2, after which building Qt for Android locally required an OPENSSL_ROOT_DIR variable to be set. Instead of making it harder for everyone to build Qt for Android (even if no intention to work on or test network code locally), downgrade the fatal error to a warning. Pick-to: 6.6 6.5 Change-Id: I6f2176a40663cc9f55aa3066af78499af1f20894 Reviewed-by: Assam Boudjelthia Reviewed-by: Mårten Nordheim --- cmake/QtTestHelpers.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 2c3fc7af988..1edb412908d 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -582,12 +582,13 @@ function(qt_internal_add_test name) if (ANDROID) if(arg_BUNDLE_ANDROID_OPENSSL_LIBS) if(NOT OPENSSL_ROOT_DIR) - message(FATAL_ERROR "The argument BUNDLE_ANDROID_OPENSSL_LIBS is set " + message(WARNING "The argument BUNDLE_ANDROID_OPENSSL_LIBS is set " "but OPENSSL_ROOT_DIR parameter is not set.") + else() + set_property(TARGET ${name} APPEND PROPERTY QT_ANDROID_EXTRA_LIBS + "${OPENSSL_ROOT_DIR}/${CMAKE_ANDROID_ARCH_ABI}/libcrypto_3.so" + "${OPENSSL_ROOT_DIR}/${CMAKE_ANDROID_ARCH_ABI}/libssl_3.so") endif() - set_property(TARGET ${name} APPEND PROPERTY QT_ANDROID_EXTRA_LIBS - "${OPENSSL_ROOT_DIR}/${CMAKE_ANDROID_ARCH_ABI}/libcrypto_3.so" - "${OPENSSL_ROOT_DIR}/${CMAKE_ANDROID_ARCH_ABI}/libssl_3.so") endif() qt_internal_android_test_arguments("${name}" test_executable extra_test_args) set(test_working_dir "${CMAKE_CURRENT_BINARY_DIR}")