Skip to content

GitLab

Commit 584e9789 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Revert "GIT_SILENT: add build without deprecated method" 

This reverts commit 3d51cc78.
parent 3d51cc78
Pipeline #73851 passed with stage
in 10 minutes and 39 seconds
Hide whitespace changes
Inline Side-by-side
CMakePresets.json
View file @ 584e9789
{
"version": 3,
"version": 2,
"configurePresets": [
{
"name": "dev",
......@@ -8,21 +8,8 @@
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
"installDir": "$env{KF5}"
},
{
"name": "dev-disable-deprecated",
"displayName": "Build as without deprecated methods",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build-disable-deprecated",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
"CMAKE_CXX_FLAGS_INIT": "-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000"
},
"installDir": "$env{KF5}"
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
}
},
{
"name": "asan",
......@@ -32,36 +19,8 @@
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"ECM_ENABLE_SANITIZERS" : "'address;undefined'",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
"installDir": "$env{KF5}"
},
{
"name": "pch",
"displayName": "Build with PCH support.",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build-pch",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
"installDir": "$env{KF5}"
},
{
"name": "dev-clang",
"displayName": "dev-clang",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build-clang",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
"environment": {
"CXX": "clang++",
"CCACHE_DISABLE": "ON"
},
"installDir": "$env{KF5}"
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
}
},
{
"name": "unity",
......@@ -70,10 +29,9 @@
"binaryDir": "${sourceDir}/build-unity",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"USE_UNITY_CMAKE_SUPPORT": "ON",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
"installDir": "$env{KF5}"
"USE_UNITY_CMAKE_SUPPORT": "ON",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
}
},
{
"name": "release",
......@@ -82,8 +40,7 @@
"binaryDir": "${sourceDir}/build-release",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
},
"installDir": "$env{KF5}"
}
},
{
"name": "profile",
......@@ -92,9 +49,8 @@
"binaryDir": "${sourceDir}/build-profile",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
"installDir": "$env{KF5}"
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
}
},
{
"name": "clazy",
......@@ -107,8 +63,7 @@
"environment": {
"CXX": "clazy",
"CCACHE_DISABLE": "ON"
},
"installDir": "$env{KF5}"
}
}
],
......@@ -117,22 +72,10 @@
"name": "dev",
"configurePreset": "dev"
},
{
"name": "dev-disable-deprecated",
"configurePreset": "dev-disable-deprecated"
},
{
"name": "pch",
"configurePreset": "pch"
},
{
"name": "release",
"configurePreset": "release"
},
{
"name": "dev-clang",
"configurePreset": "dev-clang"
},
{
"name": "asan",
"configurePreset": "asan"
......@@ -145,19 +88,19 @@
"name": "clazy",
"configurePreset": "clazy",
"environment": {
"CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo",
"CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo",
"CCACHE_DISABLE" : "ON"
}
}
],
"testPresets": [
{
{
"name": "dev",
"configurePreset": "dev",
"output": {"outputOnFailure": true},
"execution": {"noTestsAction": "error", "stopOnFailure": false}
},
{
{
"name": "asan",
"configurePreset": "asan",
"output": {"outputOnFailure": true},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment