From 79bc4f077108237d31a4160d7f262f3c5966e35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 22 May 2019 16:23:00 +0200 Subject: 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 --- coin/platform_configs/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'coin') 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' -- cgit v1.2.3