diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2019-11-29 11:57:29 +0100 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2019-11-29 11:57:29 +0100 |
| commit | 79deea9b48edbf054c22801ce13a48aab9ffbc21 (patch) | |
| tree | a0e81a9dfbc23ca37ea4b75299f41e6da21e3e14 | |
| parent | 2f5f7b027d68c0d9e3b9f7c4b80a89358c0dd74f (diff) | |
| download | wanda-79deea9b48edbf054c22801ce13a48aab9ffbc21.tar.xz wanda-79deea9b48edbf054c22801ce13a48aab9ffbc21.zip | |
cli: switch to lyra
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | conanfile.py | 2 | ||||
| -rw-r--r-- | src/wanda/wandac.cpp | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 504ef2c..3db7399 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,7 +115,7 @@ add_executable("${PROJECT_NAME}d" ) target_link_libraries("${PROJECT_NAME}d" "${PROJECT_NAME}" - "CONAN_PKG::clara" + "CONAN_PKG::lyra" "PkgConfig::GIO" ) @@ -127,7 +127,7 @@ add_executable("${PROJECT_NAME}c" ) target_link_libraries("${PROJECT_NAME}c" "${PROJECT_NAME}" - "CONAN_PKG::clara" + "CONAN_PKG::lyra" ) # Automated Tests diff --git a/conanfile.py b/conanfile.py index 7bed9a3..dbe4c65 100644 --- a/conanfile.py +++ b/conanfile.py @@ -26,7 +26,7 @@ class Wanda(ConanFile): ) requires = ( "asio/1.12.2", - "clara/1.1.5@bincrafters/stable", + "lyra/1.2.0", "CUTE/2.2.6@fmorgner/stable", "spdlog/1.4.2", "range-v3/0.4.0@ericniebler/stable", diff --git a/src/wanda/wandac.cpp b/src/wanda/wandac.cpp index 0d329a4..2c8e62d 100644 --- a/src/wanda/wandac.cpp +++ b/src/wanda/wandac.cpp @@ -5,7 +5,7 @@ #include <wanda/xdg.hpp> #include <asio.hpp> -#include <clara.hpp> +#include <lyra/lyra.hpp> #include <spdlog/sinks/stdout_color_sinks.h> #include <spdlog/spdlog.h> @@ -19,14 +19,14 @@ struct cli std::string command{}; bool help{}; - clara::Parser parser; + lyra::cli_parser parser{}; auto parse(int argc, char const * const * argv, std::ostream & error) { - parser = clara::Arg{command, "command"}("The command to send to the deamon").required() | - clara::Help(help); + parser |= lyra::arg{command, "command"}("The command to send to the deamon").required() | + lyra::help(help); - auto result = parser.parse(clara::Args{argc, argv}); + auto result = parser.parse({argc, argv}); if (!result) { |
