From 3b86216a7c2e524a42aa3ba4011e2e55142ad606 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 8 Jan 2025 14:38:52 -0800 Subject: [PATCH 1/3] Disable CLI11 vendoring by default Signed-off-by: Steve Peters --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ed8faa..369ff40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ gz_configure_project(VERSION_SUFFIX pre1) option( GZ_UTILS_VENDOR_CLI11 "If true, use the vendored version of CLI11, otherwise use an external one" - true) + OFF) #============================================================================ # Search for project-specific dependencies From 6e8feada7736cbdb68c0c7a3805ff1e53c838283 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 8 Jan 2025 15:15:21 -0800 Subject: [PATCH 2/3] packages.apt: add libcli11-dev Signed-off-by: Steve Peters --- .github/ci/packages.apt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index ebf173c..a9ee37a 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,2 +1,3 @@ +libcli11-dev libgz-cmake4-dev libspdlog-dev From 9cda1b3ce2cc16c9d1d5d2c628489051baf263a1 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 9 Jan 2025 18:27:02 -0800 Subject: [PATCH 3/3] cli_TEST: print help to fix nodiscard warning Signed-off-by: Steve Peters --- cli/src/cli_TEST.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/src/cli_TEST.cc b/cli/src/cli_TEST.cc index 6023790..71b0144 100644 --- a/cli/src/cli_TEST.cc +++ b/cli/src/cli_TEST.cc @@ -131,7 +131,7 @@ TEST(cli, options) }); app.formatter(std::make_shared(&app)); - EXPECT_NO_THROW(app.help()); + EXPECT_NO_THROW(std::cout << app.help()); EXPECT_NO_THROW(app.parse(argv)); }