Skip to content

Commit

Permalink
CI Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
franzpoeschel committed May 31, 2023
1 parent 9413821 commit 5b09f81
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
$<TARGET_PROPERTY:openPMD::thirdparty::nlohmann_json,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:openPMD::thirdparty::toml11,INTERFACE_INCLUDE_DIRECTORIES>)
endforeach()
endif()

Expand Down
3 changes: 3 additions & 0 deletions include/openPMD/auxiliary/JSON_internal.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion share/openPMD/json_schema/generate_schema.sh
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 5b09f81

Please sign in to comment.