From 199a223e2b862761a0202b1f1e83897bd196f07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franz=20P=C3=B6schel?= <franz.poeschel@gmail.com>
Date: Tue, 30 May 2023 17:56:56 +0200
Subject: [PATCH] CI Fixes

---
 CMakeLists.txt                                           | 9 +++++----
 share/openPMD/json_schema/generate_schema.sh             | 2 +-
 src/cli/{convert_json_toml.cpp => convert-json-toml.cpp} | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename src/cli/{convert_json_toml.cpp => convert-json-toml.cpp} (97%)

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
+            $<TARGET_PROPERTY:openPMD::thirdparty::nlohmann_json,INTERFACE_INCLUDE_DIRECTORIES>
+            $<TARGET_PROPERTY:openPMD::thirdparty::toml11,INTERFACE_INCLUDE_DIRECTORIES>)
     endforeach()
 endif()
 
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)
     {