Skip to content

Commit 5b09f81

Browse files
committed
CI Fixes
1 parent 9413821 commit 5b09f81

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -734,12 +734,12 @@ set(openPMD_TEST_NAMES
734734
# command line tools
735735
set(openPMD_CLI_TOOL_NAMES
736736
ls
737-
convert_json_toml
737+
convert-json-toml
738738
)
739739
set(openPMD_PYTHON_CLI_TOOL_NAMES
740740
pipe
741741
)
742-
set(openPMD_PYTHON_CLI_MODULE_NAMES ${openPMD_CLI_TOOL_NAMES})
742+
set(openPMD_PYTHON_CLI_MODULE_NAMES ls)
743743
# examples
744744
set(openPMD_EXAMPLE_NAMES
745745
1_structure
@@ -908,8 +908,9 @@ if(openPMD_BUILD_CLI_TOOLS)
908908
endif()
909909

910910
target_link_libraries(openpmd-${toolname} PRIVATE openPMD)
911-
target_link_libraries(openpmd-${toolname} PRIVATE openPMD::thirdparty::nlohmann_json)
912-
target_link_libraries(openpmd-${toolname} PRIVATE openPMD::thirdparty::toml11)
911+
target_include_directories(openpmd-${toolname} SYSTEM PRIVATE
912+
$<TARGET_PROPERTY:openPMD::thirdparty::nlohmann_json,INTERFACE_INCLUDE_DIRECTORIES>
913+
$<TARGET_PROPERTY:openPMD::thirdparty::toml11,INTERFACE_INCLUDE_DIRECTORIES>)
913914
endforeach()
914915
endif()
915916

include/openPMD/auxiliary/JSON_internal.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ namespace json
189189
* @param options as a parsed JSON object.
190190
* @param considerFiles If yes, check if `options` refers to a file and read
191191
* from there.
192+
* @param convertLowercase If yes, lowercase conversion is applied
193+
* recursively to keys and values, except for some hardcoded places
194+
* that should be left untouched.
192195
*/
193196
ParsedConfig parseOptions(
194197
std::string const &options,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
22
for toml_file in ./*.toml; do
33
dest_name="${toml_file%.toml}.json"
4-
openpmd-convert_json_toml "@$toml_file" | jq . > "$dest_name"
4+
openpmd-convert-json-toml "@$toml_file" | jq . > "$dest_name"
55
done

src/cli/convert_json_toml.cpp renamed to src/cli/convert-json-toml.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ void parsed_main(std::string jsonOrToml)
1212
auto [config, originallySpecifiedAs] = json::parseOptions(
1313
jsonOrToml, /* considerFiles = */ true, /* convertLowercase = */ false);
1414
{
15-
auto _ = std::move(jsonOrToml);
15+
[[maybe_unused]] auto _ = std::move(jsonOrToml);
1616
}
1717
switch (originallySpecifiedAs)
1818
{

0 commit comments

Comments
 (0)