From caacdfc3e103e90a60eb3056a21ff1dbd6c5c380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Tue, 2 Jul 2019 15:42:19 +0200 Subject: [PATCH] Remove "-DBUILD_TESTING=OFF" from default configs It is not needed. QtBase build instructions add it explicitly, as the tests are build with a separate cmake call (to compile tests against differently installed Qt). Change-Id: I22fe26d4bdb9dd237df76246607d823f4b4fa315 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index deac4991..667b081f 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,12 +1,12 @@ - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' - 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' + Configure arguments: '-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' - Configure arguments: '-DBUILD_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' + Configure arguments: '-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake'