From ebb983645156dbadc9427f74950f87a3279098fd Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 3 Jan 2022 09:16:56 +0200 Subject: Add OPENSSL_ROOT_DIR for macOS Android targets Enabling OpenSSL requires OPENSSL_ROOT_DIR environment variable. Pick-to: 6.3 Pick-to: 6.2 Task-number: QTBUG-97243 Change-Id: I055c236d0f346ddc2e2aff873f2bd98cacfb5ec3 Reviewed-by: Qt CI Bot Reviewed-by: Ville-Pekka Karhu --- .../platform_configs/cmake_platforms_target_android_host_macos.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml index 626440c0..4591b26c 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml @@ -22,7 +22,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-universal-packaging-build' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU', + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', 'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang' ] @@ -35,7 +35,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-universal-packaging-build' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU', + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang' ] @@ -48,7 +48,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-universal-packaging-build' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU', + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang' ] -- cgit v1.2.3