diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-12 15:42:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-06-12 15:42:44 (GMT) |
| commit | fa00a3b29bdc962429af13c64f11b51fee8c58bb (patch) | |
| tree | 9aec87bfb4dea2bb3e74ab08a8692838a79f9fa5 /Source/cmake.cxx | |
| parent | 8d3c919a3cbef7d92f24409fa7a5737e835957ee (diff) | |
| parent | c932f498426609beb14b9339c2a7dec3ea624998 (diff) | |
| download | CMake-fa00a3b29bdc962429af13c64f11b51fee8c58bb.zip CMake-fa00a3b29bdc962429af13c64f11b51fee8c58bb.tar.gz CMake-fa00a3b29bdc962429af13c64f11b51fee8c58bb.tar.bz2 | |
Merge branch 'capabilities-fileapi' into release-3.15
Merge-request: !3433
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index f0b53f4..3772f09 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -248,7 +248,7 @@ Json::Value cmake::ReportVersionJson() const return version; } -Json::Value cmake::ReportCapabilitiesJson(bool haveServerMode) const +Json::Value cmake::ReportCapabilitiesJson() const { Json::Value obj = Json::objectValue; @@ -284,18 +284,19 @@ Json::Value cmake::ReportCapabilitiesJson(bool haveServerMode) const generators.append(i.second); } obj["generators"] = generators; - obj["serverMode"] = haveServerMode; + obj["fileApi"] = cmFileAPI::ReportCapabilities(); + obj["serverMode"] = true; return obj; } #endif -std::string cmake::ReportCapabilities(bool haveServerMode) const +std::string cmake::ReportCapabilities() const { std::string result; #if defined(CMAKE_BUILD_WITH_CMAKE) Json::FastWriter writer; - result = writer.write(this->ReportCapabilitiesJson(haveServerMode)); + result = writer.write(this->ReportCapabilitiesJson()); #else result = "Not supported"; #endif |