diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-22 14:08:10 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-06-12 11:17:32 +0000 |
| commit | 8f2b2dba786e28429a207c209190d5a260981e05 (patch) | |
| tree | 578021f989ad19315d75f52b55a4d45927499629 | |
| parent | 2e5b5cc075bb03e1f28dcc02b29296ad50c3e1fb (diff) | |
Enable windows and macOS builds for yaml and cmake
Change-Id: I91aea0fe59e77cf95f7441c646e95d038f0e0032
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| -rw-r--r-- | coin/platform_configs/default.yaml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index e41c240b..ddb6b725 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -2,12 +2,11 @@ Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' -# Disabled for now -# - Template: 'qtci-macos-10.13-x86_64-2' -# Compiler: 'Clang' -# Features: ['DisableTests'] -# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' -# - Template: 'qtci-windows-10-x86_64-14' -# Compiler: 'MSVC2017' -# Features: ['DisableTests'] -# Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -G NMake Makefiles JOM' +- Template: 'qtci-macos-10.13-x86_64-2' + Compiler: 'Clang' + Features: ['DisableTests'] + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' +- Template: 'qtci-windows-10-x86_64-14' + Compiler: 'MSVC2017' + Features: ['DisableTests'] + Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_freetype=OFF' |