diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-07 09:33:11 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-06-07 11:08:38 -0400 |
| commit | 6696855f72adebbb40d475c39dace1e9f855ca2a (patch) | |
| tree | 582b2c76fc4ad59f49f8ac76551c0f1594330ab3 | |
| parent | 6b815e58baa037335fb0008f6d0345fa29931e08 (diff) | |
| download | cmake-6696855f72adebbb40d475c39dace1e9f855ca2a.tar.gz | |
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.
| -rw-r--r-- | Source/cmServerProtocol.cxx | 2 | ||||
| -rw-r--r-- | Source/cmake.cxx | 8 | ||||
| -rw-r--r-- | Source/cmake.h | 4 | ||||
| -rw-r--r-- | Source/cmcmd.cxx | 6 |
4 files changed, 8 insertions, 12 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index dad88215a8..558391f308 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -630,7 +630,7 @@ cmServerResponse cmServerProtocol1::ProcessGlobalSettings( Json::Value obj = Json::objectValue; // Capabilities information: - obj[kCAPABILITIES_KEY] = cm->ReportCapabilitiesJson(true); + obj[kCAPABILITIES_KEY] = cm->ReportCapabilitiesJson(); obj[kDEBUG_OUTPUT_KEY] = cm->GetDebugOutput(); obj[kTRACE_KEY] = cm->GetTrace(); diff --git a/Source/cmake.cxx b/Source/cmake.cxx index f0b53f45c9..0dca5780f4 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 diff --git a/Source/cmake.h b/Source/cmake.h index 4de9d28ea9..fa4409aeb5 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -136,9 +136,9 @@ public: #if defined(CMAKE_BUILD_WITH_CMAKE) Json::Value ReportVersionJson() const; - Json::Value ReportCapabilitiesJson(bool haveServerMode) const; + Json::Value ReportCapabilitiesJson() const; #endif - std::string ReportCapabilities(bool haveServerMode) const; + std::string ReportCapabilities() const; //@{ /** diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index a983d309bd..86082e5174 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -734,11 +734,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string> const& args) return 1; } cmake cm(cmake::RoleInternal, cmState::Unknown); -#if defined(CMAKE_BUILD_WITH_CMAKE) - std::cout << cm.ReportCapabilities(true); -#else - std::cout << cm.ReportCapabilities(false); -#endif + std::cout << cm.ReportCapabilities(); return 0; } |