diff --git a/CMakeLists.txt b/CMakeLists.txt index 03245533e9..fe10965721 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -734,12 +734,12 @@ set(openPMD_TEST_NAMES # command line tools set(openPMD_CLI_TOOL_NAMES ls - convert_json_toml + convert-json-toml ) set(openPMD_PYTHON_CLI_TOOL_NAMES pipe ) -set(openPMD_PYTHON_CLI_MODULE_NAMES ${openPMD_CLI_TOOL_NAMES}) +set(openPMD_PYTHON_CLI_MODULE_NAMES ls) # examples set(openPMD_EXAMPLE_NAMES 1_structure @@ -908,8 +908,9 @@ if(openPMD_BUILD_CLI_TOOLS) endif() target_link_libraries(openpmd-${toolname} PRIVATE openPMD) - target_link_libraries(openpmd-${toolname} PRIVATE openPMD::thirdparty::nlohmann_json) - target_link_libraries(openpmd-${toolname} PRIVATE openPMD::thirdparty::toml11) + target_include_directories(openpmd-${toolname} SYSTEM PRIVATE + $ + $) endforeach() endif() diff --git a/include/openPMD/auxiliary/JSON_internal.hpp b/include/openPMD/auxiliary/JSON_internal.hpp index da6652a303..f003cce086 100644 --- a/include/openPMD/auxiliary/JSON_internal.hpp +++ b/include/openPMD/auxiliary/JSON_internal.hpp @@ -189,6 +189,9 @@ namespace json * @param options as a parsed JSON object. * @param considerFiles If yes, check if `options` refers to a file and read * from there. + * @param convertLowercase If yes, lowercase conversion is applied + * recursively to keys and values, except for some hardcoded places + * that should be left untouched. */ ParsedConfig parseOptions( std::string const &options, diff --git a/share/openPMD/json_schema/generate_schema.sh b/share/openPMD/json_schema/generate_schema.sh index 1bd74c38af..677a9d9f09 100755 --- a/share/openPMD/json_schema/generate_schema.sh +++ b/share/openPMD/json_schema/generate_schema.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash for toml_file in ./*.toml; do dest_name="${toml_file%.toml}.json" - openpmd-convert_json_toml "@$toml_file" | jq . > "$dest_name" + openpmd-convert-json-toml "@$toml_file" | jq . > "$dest_name" done diff --git a/src/cli/convert_json_toml.cpp b/src/cli/convert-json-toml.cpp similarity index 97% rename from src/cli/convert_json_toml.cpp rename to src/cli/convert-json-toml.cpp index c5187ebb89..3abb6127f8 100644 --- a/src/cli/convert_json_toml.cpp +++ b/src/cli/convert-json-toml.cpp @@ -12,7 +12,7 @@ void parsed_main(std::string jsonOrToml) auto [config, originallySpecifiedAs] = json::parseOptions( jsonOrToml, /* considerFiles = */ true, /* convertLowercase = */ false); { - auto _ = std::move(jsonOrToml); + [[maybe_unused]] auto _ = std::move(jsonOrToml); } switch (originallySpecifiedAs) {