diff options
| author | Toni Saario <toni.saario@qt.io> | 2021-11-12 11:29:11 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@qt.io> | 2022-02-28 07:43:41 +0000 |
| commit | 28920cb7b4d5d0b729135939b3f03a4281848caf (patch) | |
| tree | 2b61b9ceff8e308ded31e76df1794aee1ac151f7 /coin/platform_configs/cmake_platforms_target_android_host_linux.yaml | |
| parent | a4cc949b8dbfa2f21c323fd7cbffd011b2dbbc84 (diff) | |
Update conan profiles
Split the end user profile variants in two, e.g.:
linux-x86_64-gcc
->
linux-x86_64-gcc # 1
baseprofiles/linux-x86_64-gcc # 2
1) This is still the end user variant but this includes the
counterpart from 3rdparty subfolder
2) This contains those settings and options that are needed
for 3rd party depedencies like icu
Task-number: QTBUG-99213
Pick-to: 6.2 6.3
Change-Id: Ia6d7d9c5759848ff339cf8f50a40b10dfd9877d6
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin/platform_configs/cmake_platforms_target_android_host_linux.yaml')
| -rw-r--r-- | coin/platform_configs/cmake_platforms_target_android_host_linux.yaml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml index 402cbfda..8efd491d 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml @@ -10,8 +10,8 @@ Configurations: 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=arm64-v8a -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/linux-x86_64-gcc', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang' ] - Template: 'qtci-linux-RHEL-8.4-x86_64-50' @@ -36,8 +36,8 @@ Configurations: 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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang' ] - Template: 'qtci-linux-RHEL-8.4-x86_64-50' @@ -49,6 +49,6 @@ Configurations: 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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang' ] |