From 20e8121c775a307d68e600095b1410d408a487b2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 25 Apr 2019 11:43:00 +0200 Subject: [PATCH] Use yaml configuration file for cmake support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is needed by new coin to support cmake build as only there configuration arguments are separated from features. Change-Id: I960ec693f80803fd86de472efc953a38358ae14e Reviewed-by: Jędrzej Nowacki --- coin/platform_configs/default.yaml | 13 +++++++++++++ coin/platform_configs/qt3d-runtime.txt | 21 --------------------- coin/platform_configs/qtconnectivity.txt | 3 --- coin/platform_configs/qtdeclarative.txt | 4 ---- coin/platform_configs/qtsaferenderer.txt | 3 --- coin/platform_configs/qtsdk.txt | 4 ---- coin/platform_configs/qtwebkit.txt | 4 ---- coin/platform_configs/tqtc-qt-rta.txt | 6 ------ 8 files changed, 13 insertions(+), 45 deletions(-) create mode 100644 coin/platform_configs/default.yaml delete mode 100644 coin/platform_configs/qt3d-runtime.txt delete mode 100644 coin/platform_configs/qtconnectivity.txt delete mode 100644 coin/platform_configs/qtdeclarative.txt delete mode 100644 coin/platform_configs/qtsaferenderer.txt delete mode 100644 coin/platform_configs/qtsdk.txt delete mode 100644 coin/platform_configs/qtwebkit.txt delete mode 100644 coin/platform_configs/tqtc-qt-rta.txt diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml new file mode 100644 index 00000000..5df190c4 --- /dev/null +++ b/coin/platform_configs/default.yaml @@ -0,0 +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}}' +# 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}}' +# - 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}}' diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt deleted file mode 100644 index 1001d869..00000000 --- a/coin/platform_configs/qt3d-runtime.txt +++ /dev/null @@ -1,21 +0,0 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt deleted file mode 100644 index 15f11bd1..00000000 --- a/coin/platform_configs/qtconnectivity.txt +++ /dev/null @@ -1,3 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt deleted file mode 100644 index e2b69559..00000000 --- a/coin/platform_configs/qtdeclarative.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild -qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt deleted file mode 100644 index ec14f610..00000000 --- a/coin/platform_configs/qtsaferenderer.txt +++ /dev/null @@ -1,3 +0,0 @@ -Template Target OS Target arch Compiler Features ------------------------------------ ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples diff --git a/coin/platform_configs/qtsdk.txt b/coin/platform_configs/qtsdk.txt deleted file mode 100644 index 3011926d..00000000 --- a/coin/platform_configs/qtsdk.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic -qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt deleted file mode 100644 index 27782f88..00000000 --- a/coin/platform_configs/qtwebkit.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-14 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt deleted file mode 100644 index 8fbb5a00..00000000 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ /dev/null @@ -1,6 +0,0 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic -