From 32ccf2a0cdbb000041e1b3edac0f0af0c26a4893 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 17 Mar 2020 17:29:19 +0100 Subject: CMake: Enable qt5.git CMake top-level / super builds Add simple instructions to only configure and not build top-level builds, similar to what the qmake configurations do. The CMake configurations need to be copy-pasted again into qt5.yaml. We can't use default.yaml because that would enable CMake configurations for repositories that are not ported to CMake, and thus break the integrations. Update qtqa sha1 to a dev branch one which contains the module_config.yaml instructions to build qtqa with CMake. Task-number: QTBUG-84874 Task-number: QTBUG-84918 Change-Id: I8c64f5e0acc96e14a4952abb6c77fe5c8e27a0ec Reviewed-by: Liang Qi --- coin/platform_configs/qt5.yaml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index fb64c528..217c0007 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -21,3 +21,44 @@ 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: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + 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}}' + 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 -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