diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 13:15:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 13:24:54 +0200 |
| commit | 5ef4ad5e90e86731542a5620dc500ec4da40c9d6 (patch) | |
| tree | ee798e10633f87253b389410f2b5343582d29702 /coin/platform_configs/default.yaml | |
| parent | a2dc8d6c2141bce84fe9619d5ee6851e73de8a95 (diff) | |
| parent | df53ff5f85f69932538cc1c571b86b0c2a885a10 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmakewip/cmake
Bringing in new SHA1s, and updated cmake-specific configurations.
Intended for Qt6 Installer essentials package creation.
Conflicts
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
Change-Id: I6abc2d952ae75785e34b70977e41018a72acf5bc
Diffstat (limited to 'coin/platform_configs/default.yaml')
| -rw-r--r-- | coin/platform_configs/default.yaml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 5fcc5821..c4be174a 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -9,7 +9,7 @@ Configurations: Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' Features: ['Packaging'] - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + 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}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -32,4 +32,9 @@ Configurations: Features: ['Packaging'] 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_UIKIT_SDK=iphoneos'] + 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}}']
\ No newline at end of file |