Skip to content

Commit 572620d

Browse files
authored
Disable CLI11 vendoring by default (#167)
* packages.apt: add libcli11-dev * cli_TEST: print help to fix nodiscard warning * Update Migration.md Signed-off-by: Steve Peters <[email protected]>
1 parent 2ac3dcb commit 572620d

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

.github/ci/packages.apt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
libcli11-dev
12
libgz-cmake4-dev
23
libspdlog-dev

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ gz_configure_project(VERSION_SUFFIX pre1)
2525
option(
2626
GZ_UTILS_VENDOR_CLI11
2727
"If true, use the vendored version of CLI11, otherwise use an external one"
28-
true)
28+
OFF)
2929

3030
#============================================================================
3131
# Search for project-specific dependencies

Migration.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@ Deprecated code produces compile-time warnings. These warning serve as
55
notification to users that their code should be upgraded. The next major
66
release will remove the deprecated code.
77

8+
## Gazebo Utils 3.X to 4.X
9+
10+
The default value of `GZ_UTILS_VENDOR_CLI11` is now set to `OFF`, so that
11+
an external version of `cli11` will be preferred by default. This is in
12+
preparation to remove the vendored version (see
13+
[issue #135](https://github.com/gazebosim/gz-utils/issues/135)).
14+
15+
## Gazebo Utils 2.X to 3.X
16+
17+
The `ignition` namespace, `ignition/` header files, `IGN_` prefixed macros,
18+
and `IgnitionFormatter` class have been removed.
19+
820
## Gazebo Utils 1.X to 2.X
921

1022
* The `ignition` namespace is deprecated and will be removed in future versions.

cli/src/cli_TEST.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ TEST(cli, options)
131131
});
132132

133133
app.formatter(std::make_shared<GzFormatter>(&app));
134-
EXPECT_NO_THROW(app.help());
134+
EXPECT_NO_THROW(std::cout << app.help());
135135
EXPECT_NO_THROW(app.parse(argv));
136136
}
137137

0 commit comments

Comments
 (0)