summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/buildtool/common/cli.hpp24
-rw-r--r--src/buildtool/main/main.cpp2
2 files changed, 12 insertions, 14 deletions
diff --git a/src/buildtool/common/cli.hpp b/src/buildtool/common/cli.hpp
index c638193b..46e8a7c9 100644
--- a/src/buildtool/common/cli.hpp
+++ b/src/buildtool/common/cli.hpp
@@ -228,19 +228,17 @@ static inline auto SetupAnalysisArguments(
"Instead of the target result, request input for this action.")
->type_name("ACTION");
app->add_option_function<std::vector<std::string>>(
- "target",
- [clargs](auto const& target_raw) {
- if (target_raw.size() > 1) {
- clargs->target =
- nlohmann::json{target_raw[0], target_raw[1]};
- }
- else {
- clargs->target = nlohmann::json{target_raw[0]}[0];
- }
- },
- "Module and target name to build.\n"
- "Assumes current module if module name is omitted.")
- ->expected(2);
+ "target",
+ [clargs](auto const& target_raw) {
+ if (target_raw.size() == 1) {
+ clargs->target = nlohmann::json(target_raw[0]);
+ }
+ else {
+ clargs->target = nlohmann::json(target_raw);
+ }
+ },
+ "Module and target name to build.\n"
+ "Assumes current module if module name is omitted.");
app->add_option("--target-root",
clargs->target_root,
"Path of the target files' root directory.\n"
diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp
index 146ec221..3ffb8159 100644
--- a/src/buildtool/main/main.cpp
+++ b/src/buildtool/main/main.cpp
@@ -550,7 +550,7 @@ void SetupHashFunction() {
Base::EntityName{Base::NamedTarget{main_repo, current_module, ""}},
[&clargs](std::string const& parse_err) {
Logger::Log(LogLevel::Error,
- "Parsing target name {} failed with:\n{}.",
+ "Parsing target name {} failed with:\n{}",
clargs.target->dump(),
parse_err);
});