mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

fileapi: Omit NONE language entries from toolchains

Browse Source 
Fixes: #27885
This commit is contained in:
Tyler Yankee
2026-06-23 08:42:00 -04:00
parent ee0198b4b2
commit a3b5591bbc
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFileAPIToolchains.cxx
+3
View File
@@ -66,6 +66,9 @@ Json::Value Toolchains::DumpToolchains()
for (std::string const& lang :
this->FileAPI.GetCMakeInstance()->GetState()->GetEnabledLanguages()) {
if (lang == "NONE") {
continue;
}
toolchains.append(this->DumpToolchain(lang));
}
Tests/RunCMake/FileAPI/toolchains-v1-check.py
+4
View File
@@ -48,14 +48,18 @@ def check_object_toolchains(o):
# Other platform-specific toolchains may exist (like RC on Windows).
has_cxx_toolchain = False
has_none_toolchain = False
for toolchain in toolchains:
assert is_dict(toolchain)
assert "language" in toolchain
if toolchain["language"] == "CXX":
check_object_toolchain(toolchain, EXPECTED_TOOLCHAIN)
has_cxx_toolchain = True
if toolchain["language"] == "NONE":
has_none_toolchain = True
assert has_cxx_toolchain
assert not has_none_toolchain
def check_object_toolchain(o, expected):
expected_keys = [