diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2022-02-03 11:16:52 +0200 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2022-02-04 08:17:15 +0200 |
| commit | 0e641142c1d5f6c98a8140ed65862cb377ce6d91 (patch) | |
| tree | 17b7c7a38d2af3584fde8138a8ec7337fa74362f /coin/platform_configs/cmake_platforms_target_android_host_windows.yaml | |
| parent | 72997d7039f5ce77fc5eca06152d38f70510bde4 (diff) | |
Make Win 10 21H2 Environment variables to match with the old Win 10
Fix few differencies. E.g. Conan env variables are missing
Pick-to: 6.3
Change-Id: Id08c422b1df61c2acaf59cf2bcdb0cc55cdcb1e7
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin/platform_configs/cmake_platforms_target_android_host_windows.yaml')
| -rw-r--r-- | coin/platform_configs/cmake_platforms_target_android_host_windows.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml index ee238b1c..53691a97 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml @@ -25,6 +25,8 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', '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}} -DFEATURE_pkg_config=OFF', + 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/windows-android-arm64-clang' ] - Template: 'qtci-windows-10-x86_64-52' @@ -51,6 +53,8 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', '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}} -DFEATURE_pkg_config=OFF', + 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/windows-android-armv7-clang' ] - Template: 'qtci-windows-10-x86_64-52' @@ -77,6 +81,8 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', '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}} -DFEATURE_pkg_config=OFF', + 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang' ] - Template: 'qtci-windows-10-x86_64-52' |