Skip to content

Commit ac034ba

Browse files
committed
Fix selecting no local static analyzers
1 parent a12be98 commit ac034ba

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

cmake-init/cmake_init.py

-3
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ def ask(*args, **kwargs):
166166
"c_header": False,
167167
"include_source": False,
168168
"has_source": True,
169-
"both_analyzers": False,
170169
}
171170
d["uc_name"] = d["name"].upper().replace("-", "_")
172171
if d["type_id"] != "e":
@@ -185,8 +184,6 @@ def ask(*args, **kwargs):
185184
d["include_source"] = True
186185
if d["type_id"] == "h":
187186
d["has_source"] = False
188-
if d["use_clang_tidy"] and d["use_cppcheck"]:
189-
d["both_analyzers"] = True
190187
d["c_header"] = d["c"] and d["type_id"] == "h"
191188
return d
192189

cmake-init/templates/common/CMakeUserPresets.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,10 @@
66
"patch": 0
77
},
88
"configurePresets": [
9-
{
10-
"name": "static-analyzers",
11-
"hidden": true,
12-
"inherits": [{if use_clang_tidy}"clang-tidy"{end}{if both_analyzers}, {end}{if use_cppcheck}"cppcheck"{end}]
13-
},
149
{
1510
"name": "dev-common",
1611
"hidden": true,
17-
"inherits": ["static-analyzers", "dev-mode"],
12+
"inherits": ["dev-mode"{if use_clang_tidy}, "clang-tidy"{end}{if use_cppcheck}, "cppcheck"{end}],
1813
"cacheVariables": {
1914
"BUILD_MCSS_DOCS": "ON"
2015
}

0 commit comments

Comments
 (0)