aboutsummaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@qt.io>2019-05-22 16:23:00 +0200
committerLiang Qi <liang.qi@qt.io>2019-05-22 15:35:44 +0000
commit79bc4f077108237d31a4160d7f262f3c5966e35f (patch)
treee8b9be41648a999a6c0e6adef40a5cffaef28bd8 /coin
parent20e8121c775a307d68e600095b1410d408a487b2 (diff)
Move some configure arguments to qtbase instructions
These arguments are specific to the build and changes to them are _not_ affecting configuration. Change-Id: I701b7d83511c5f80b88c5aab09eae3ecb6df74a1 Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'coin')
-rw-r--r--coin/platform_configs/default.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index 5df190c4..e41c240b 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,13 +1,13 @@
- Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Features: ['DisableTests']
- Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} {{.SourceDir}}'
+ 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_INSTALL_PREFIX:PATH={{.InstallDir}} -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 {{.SourceDir}}'
+# 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_INSTALL_PREFIX:PATH=c:{{.InstallDir}} -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_CMAKE_TOOLCHAIN_FILE}} -G NMake Makefiles JOM {{.SourceDir}}'
+# 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'