diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-07 13:33:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-06-07 15:08:38 (GMT) |
| commit | 6696855f72adebbb40d475c39dace1e9f855ca2a (patch) | |
| tree | 582b2c76fc4ad59f49f8ac76551c0f1594330ab3 /Source/cmake.cxx | |
| parent | 6b815e58baa037335fb0008f6d0345fa29931e08 (diff) | |
| download | CMake-6696855f72adebbb40d475c39dace1e9f855ca2a.zip CMake-6696855f72adebbb40d475c39dace1e9f855ca2a.tar.gz CMake-6696855f72adebbb40d475c39dace1e9f855ca2a.tar.bz2 | |
cmake: Simplify implementation of -E capabilities
The `cmake -E capabilities` command-line tool is implemented only in a
full-featured (non-bootstrap) CMake, and server mode is now always
available in this case.
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index f0b53f4..0dca578 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,18 @@ Json::Value cmake::ReportCapabilitiesJson(bool haveServerMode) const generators.append(i.second); } obj["generators"] = generators; - obj["serverMode"] = haveServerMode; + 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 |