diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-24 11:07:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-24 11:07:38 (GMT) |
| commit | 03ffd442bd34e2a3478b125ef1055837926bcd0c (patch) | |
| tree | fb874d2868b9e019ab57674d134bed9503c122b8 /Source/cmake.cxx | |
| parent | a7aef7a1820b24050ecdc1acb02cf790c1d8e065 (diff) | |
| parent | 72b4c2c48ae7dfd8c2813018c72ed0d2e6bb907a (diff) | |
| download | CMake-03ffd442bd34e2a3478b125ef1055837926bcd0c.zip CMake-03ffd442bd34e2a3478b125ef1055837926bcd0c.tar.gz CMake-03ffd442bd34e2a3478b125ef1055837926bcd0c.tar.bz2 | |
Merge topic 'server-separate-json'
72b4c2c48a server: Compile json object generation source separately
b48165346f server: Split json dictionary into separate header
85be67217b server: Split json object generation into separate source
aabce52851 server: factor out json object generation entry points
fc43492e44 cmake: Factor json version object construction into helper
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2408
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 6c14834..c26a380 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -225,10 +225,8 @@ cmake::~cmake() } #if defined(CMAKE_BUILD_WITH_CMAKE) -Json::Value cmake::ReportCapabilitiesJson(bool haveServerMode) const +Json::Value cmake::ReportVersionJson() const { - Json::Value obj = Json::objectValue; - // Version information: Json::Value version = Json::objectValue; version["string"] = CMake_VERSION; version["major"] = CMake_VERSION_MAJOR; @@ -236,8 +234,15 @@ Json::Value cmake::ReportCapabilitiesJson(bool haveServerMode) const version["suffix"] = CMake_VERSION_SUFFIX; version["isDirty"] = (CMake_VERSION_IS_DIRTY == 1); version["patch"] = CMake_VERSION_PATCH; + return version; +} - obj["version"] = version; +Json::Value cmake::ReportCapabilitiesJson(bool haveServerMode) const +{ + Json::Value obj = Json::objectValue; + + // Version information: + obj["version"] = this->ReportVersionJson(); // Generators: std::vector<cmake::GeneratorInfo> generatorInfoList; |