From 28920cb7b4d5d0b729135939b3f03a4281848caf Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Fri, 12 Nov 2021 11:29:11 +0200 Subject: Update conan profiles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- coin/platform_configs/cmake_platforms.yaml | 23 ++++++++++++---------- .../cmake_platforms_target_android_host_linux.yaml | 12 +++++------ .../cmake_platforms_target_android_host_macos.yaml | 16 +++++++-------- ...make_platforms_target_android_host_windows.yaml | 16 +++++++-------- coin/platform_configs/cmake_platforms_wasm.yaml | 10 +++++++--- coin/platform_configs/macos.yaml | 2 +- coin/platform_configs/qtbase.yaml | 5 ++--- 7 files changed, 45 insertions(+), 39 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 784e83cf..c53bc0a0 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -27,7 +27,7 @@ Configurations: Features: ['Sccache'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' Environment variables: [ - 'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc'] + 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'] - Template: 'qtci-linux-SLES-15_SP3-x86_64-51' Compiler: 'GCC' @@ -40,7 +40,7 @@ Configurations: Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' Environment variables: [ 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', - 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64'] + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64'] - Template: 'qtci-windows-11_21H2-x86_64-51' Compiler: 'MSVC2019' @@ -72,8 +72,9 @@ Configurations: Id: 'Windows10_21H2-MSVC2019-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' - Features: ['Sccache', "DebugAndRelease"] + Features: ['Sccache', 'Conan', "DebugAndRelease"] Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer'] - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' @@ -82,8 +83,8 @@ Configurations: Platform dependency: 'Windows10_21H2-MSVC2019-x64-host' Environment variables: [ 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64', - 'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64', 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}'] @@ -105,7 +106,9 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', - 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] + 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64'] - Id: 'RHEL-8.4-host' Template: 'qtci-linux-RHEL-8.4-x86_64-50' @@ -113,7 +116,7 @@ Configurations: Features: ['Packaging', 'Sccache'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY' Environment variables: [ - 'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'] + 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc'] - Template: 'qtci-macos-11-x86_64-104' Target os: 'IOS_ANY' @@ -124,8 +127,8 @@ Configurations: Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=', - 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', - 'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang'] + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'] - Id: 'Windows10_21H2-Mingw11-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' @@ -136,7 +139,7 @@ Configurations: 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', - 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw'] + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw'] - Id: 'Windows10_21H2-LLVM-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' 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' ] 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 4591b26c..96db0ce7 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_macos.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/macos-universal-clang', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang' ] - Template: 'qtci-macos-10.14-x86_64' @@ -23,8 +23,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=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' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-armv7-clang' ] - Template: 'qtci-macos-10.14-x86_64' @@ -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/macos-universal-clang', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang' ] - Template: 'qtci-macos-10.14-x86_64' @@ -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/macos-universal-clang', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang' ] 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 05e28ac6..cbaa774c 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml @@ -11,8 +11,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' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-arm64-clang' ] - Template: 'qtci-windows-10_21H2-x86_64-51' @@ -25,8 +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=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' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang' ] - Template: 'qtci-windows-10_21H2-x86_64-51' @@ -39,8 +39,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' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-x86-clang' ] - Template: 'qtci-windows-10_21H2-x86_64-51' @@ -53,6 +53,6 @@ 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_64 -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_64-clang'] + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-x86_64-clang'] diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index a161f706..1dbff8b4 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -9,6 +9,8 @@ Configurations: Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer', + 'CONAN_PROFILE=coin/conan/profiles/ci-linux-webassembly-x86_64-clang' ] - Template: 'qtci-windows-10_21H2-x86_64-51' @@ -21,7 +23,9 @@ Configurations: 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release', - 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF'] + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang'] - Template: 'qtci-macos-10.14-x86_64' Target os: 'WebAssembly' @@ -32,6 +36,6 @@ Configurations: Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release', - 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc', - 'CONAN_PROFILE=coin/conan/profiles/linux-webassembly-x86_64-gcc' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-macos-webassembly-x86_64-clang' ] diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 0638daca..19f8bbfb 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -16,7 +16,7 @@ Configurations: Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' Environment variables: [ 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF', - 'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang' + 'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang' ] # Test on all supported macOS versions (deployment targets) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 13b76470..8ff467c6 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -17,8 +17,7 @@ Configurations: Features: ['Packaging', 'Sccache', 'AndroidTestRun'] 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_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', 'CONAN_INSTALL_DIR={{.InstallDir}}/target', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang', 'ANDROID_EMULATOR=@emulator_x86_api_23'] - -- cgit v1.2.3