From 0cc1973ba89b0c8372cbe06d9436e2170baa86d9 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Mon, 25 May 2020 14:39:51 +0300 Subject: CMake: Deduplicate the cmake platforms After Coin commit 60a6f795f5923c7c206b3fec4ebad991ce30d633 it is possible to include other intermediate configuration files. Create a new cmake_platforms.yaml file which will contain the default list of platform configurations to be tested in all cmake-enabled repos and qt5.git. Task-number: QTBUG-85044 Change-Id: I10e4dff8793a1ffb5776e00dac80f43394d18578 Reviewed-by: Toni Saario Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- coin/platform_configs/qt5.yaml | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) (limited to 'coin/platform_configs/qt5.yaml') diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index c7191413..debefe83 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,4 +1,5 @@ Version: 2 +Include: [cmake_platforms.yaml] Configurations: - Template: 'qtci-windows-7-x86-3' @@ -21,44 +22,3 @@ Configurations: Target compiler: 'Clang' Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'GCC' - Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' -- - Template: 'qtci-linux-openSUSE-15.1-x86_64' - Compiler: 'GCC' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' -- - Template: 'qtci-macos-10.14-x86_64' - Compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' -- - Template: 'qtci-windows-10-x86_64-15' - Compiler: 'MSVC2019' - Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Compiler: 'GCC' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_BUILD_TYPE=RelWithDebInfo -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' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'Android_ANY' - Target arch: 'arm64' - Compiler: 'GCC' - Target compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_BUILD_TYPE=RelWithDebInfo -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' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}'] -- - Template: 'qtci-macos-10.14-x86_64' - Target os: 'IOS_ANY' - Target arch: 'arm64' - Compiler: 'Clang' - Target compiler: 'Clang' - Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' - Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] -- cgit v1.2.3