summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-06-17 11:56:39 (GMT)
committerBrad King <brad.king@kitware.com>2019-06-17 11:56:39 (GMT)
commite815fad43f46c9145510972aef2d706b1c8a05d2 (patch)
tree51906a20f5cfb6319f954db17fc6192d398690ce
parent95b9d6af80d08e795cde9f94454d2431263dd084 (diff)
parentd63398d32da8948fae80ce2e29f9ca139112a03f (diff)
downloadCMake-e815fad43f46c9145510972aef2d706b1c8a05d2.zip
CMake-e815fad43f46c9145510972aef2d706b1c8a05d2.tar.gz
CMake-e815fad43f46c9145510972aef2d706b1c8a05d2.tar.bz2
Merge branch 'capabilities-fileapi' into release-3.15
Merge-request: !3442
-rw-r--r--Source/cmFileAPI.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmFileAPI.cxx b/Source/cmFileAPI.cxx
index ed45398..ba42669 100644
--- a/Source/cmFileAPI.cxx
+++ b/Source/cmFileAPI.cxx
@@ -812,7 +812,7 @@ Json::Value cmFileAPI::ReportCapabilities()
request["kind"] = ObjectKindName(ObjectKind::CodeModel);
Json::Value& versions = request["version"] = Json::arrayValue;
versions.append(BuildVersion(2, CodeModelV2Minor));
- requests.append(std::move(request));
+ requests.append(std::move(request)); // NOLINT(*)
}
{
@@ -820,7 +820,7 @@ Json::Value cmFileAPI::ReportCapabilities()
request["kind"] = ObjectKindName(ObjectKind::Cache);
Json::Value& versions = request["version"] = Json::arrayValue;
versions.append(BuildVersion(2, CacheV2Minor));
- requests.append(std::move(request));
+ requests.append(std::move(request)); // NOLINT(*)
}
{
@@ -828,7 +828,7 @@ Json::Value cmFileAPI::ReportCapabilities()
request["kind"] = ObjectKindName(ObjectKind::CMakeFiles);
Json::Value& versions = request["version"] = Json::arrayValue;
versions.append(BuildVersion(1, CMakeFilesV1Minor));
- requests.append(std::move(request));
+ requests.append(std::move(request)); // NOLINT(*)
}
return capabilities;