diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2023-07-21 16:01:01 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2023-07-26 14:07:38 (GMT) |
| commit | 93ed53790cb1e2d5f25f26156ee5c6590b0d3150 (patch) | |
| tree | 7171d8558870456485ac3d2be589952c23febccc /Source/cmJSONHelpers.h | |
| parent | 8129bf85edea4ab6646b14687134b5a7dc5b23a5 (diff) | |
| download | CMake-93ed53790cb1e2d5f25f26156ee5c6590b0d3150.zip CMake-93ed53790cb1e2d5f25f26156ee5c6590b0d3150.tar.gz CMake-93ed53790cb1e2d5f25f26156ee5c6590b0d3150.tar.bz2 | |
bootstrap: Unconditionally build libjsoncpp
Diffstat (limited to 'Source/cmJSONHelpers.h')
| -rw-r--r-- | Source/cmJSONHelpers.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/cmJSONHelpers.h b/Source/cmJSONHelpers.h index 94641de..5dfb154 100644 --- a/Source/cmJSONHelpers.h +++ b/Source/cmJSONHelpers.h @@ -38,7 +38,6 @@ using ObjectErrorGenerator = std::function<ErrorGenerator(ObjectError, const Json::Value::Members&)>; const auto EXPECTED_TYPE = [](const std::string& type) { return [type](const Json::Value* value, cmJSONState* state) -> void { -#if !defined(CMAKE_BOOTSTRAP) if (state->key().empty()) { state->AddErrorAtValue(cmStrCat("Expected ", type), value); return; @@ -48,7 +47,6 @@ const auto EXPECTED_TYPE = [](const std::string& type) { errMsg = cmStrCat(errMsg, ", got: ", value->asString()); } state->AddErrorAtValue(errMsg, value); -#endif }; }; const auto INVALID_STRING = [](const Json::Value* value, @@ -75,7 +73,6 @@ const auto INVALID_NAMED_OBJECT = const Json::Value::Members& extraFields) -> ErrorGenerator { return [nameGenerator, errorType, extraFields]( const Json::Value* value, cmJSONState* state) -> void { -#if !defined(CMAKE_BOOTSTRAP) std::string name = nameGenerator(value, state); switch (errorType) { case ObjectError::RequiredMissing: @@ -102,7 +99,6 @@ const auto INVALID_NAMED_OBJECT = value); break; } -#endif }; }; }; |