Skip to content

Commit

Permalink
Revert to old CLI11 version as the new one appears broken as precompi…
Browse files Browse the repository at this point in the history
…led lib.
  • Loading branch information
abeltrano committed Apr 22, 2024
1 parent dc56811 commit f34ee7c
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 21 deletions.
4 changes: 3 additions & 1 deletion src/common/server/NetRemoteServerConfiguration.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
#include <vector>

#include <CLI/App.hpp>
#include <CLI/Config.hpp>
#include <CLI/Error.hpp>
#include <CLI/Formatter.hpp>
#include <microsoft/net/remote/NetRemoteServerConfiguration.hxx>

using namespace Microsoft::Net::Remote;
Expand Down Expand Up @@ -49,7 +51,7 @@ ParseCliAppOptions(bool throwOnParseError, Args&&... args)
app.parse(std::forward<Args>(args)...);
} catch (const CLI::ParseError& parseError) {
if (throwOnParseError) {
throw parseError; // NOLINT(cert-err60-cpp)
throw parseError; // NOLINT(cert-err60-cpp)
}
}

Expand Down
47 changes: 27 additions & 20 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "netremote",
"version-string": "1",
"dependencies": [
{
"name": "sdbus-cpp",
"platform": "linux"
},
"grpc",
"cli11",
"protobuf",
"catch2",
"plog",
"magic-enum",
{
"name": "wil",
"platform": "windows"
}
]
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "netremote",
"version-string": "1",
"dependencies": [
{
"name": "sdbus-cpp",
"platform": "linux"
},
"grpc",
"cli11",
"protobuf",
"catch2",
"plog",
"magic-enum",
{
"name": "wil",
"platform": "windows"
}
],
"overrides": [
{
"name": "cli11",
"version": "2.3.1"
}
],
"builtin-baseline": "9224b3bbd8df24999d85720b1d005dd6f969ade0"
}

0 comments on commit f34ee7c

Please sign in to comment.