From 79ac12a4d76e0f640aabc7c74ff5880e9e208f56 Mon Sep 17 00:00:00 2001
From: sha512sum <linuxnyasha@tutanota.com>
Date: Fri, 30 Aug 2024 09:07:59 +0000
Subject: [PATCH] Update

---
 .gitignore                                 | 2 ++
 CMakeLists.txt                             | 7 +++++++
 examples/src/cli.cpp                       | 2 +-
 include/cserver/components/cli/manager.hpp | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 58e8fb4..eeab95e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ cmake/CPM.cmake
 cpm-package-lock.cmake
 include/openssl
 include/tls.h
+libcserver_shared.so
+libcserver_static.a
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7c3c56..4492d78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ set(CXX_EXTENSIONS NO)
 set(Boost_USE_MULTITHREADED ON)
 set(BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED "url;program_options")
 set(BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED "asio;pfr")
+set(UTEMPL_MODULE OFF)
 set(TRY_BOOST_VERSION "1.85.0")
 set(BOOST_INCLUDE_LIBRARIES
     "${BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED};${BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}"
@@ -14,6 +15,7 @@ set(BOOST_INCLUDE_LIBRARIES
 
 option(CPM_USE_LOCAL_PACKAGES "Use local packages" ON)
 option(CSERVER_USE_LIBRESSL "Use LibreSSL" OFF)
+option(UTEMPL_USE_LOCAL_PACKAGE "Use utempl local package" OFF)
 
 file(
   DOWNLOAD
@@ -69,11 +71,16 @@ CPMAddPackage(
 
 endif()
 
+set(TMP ${CPM_USE_LOCAL_PACKAGES})
+set(CPM_USE_LOCAL_PACKAGES ${UTEMPL_USE_LOCAL_PACKAGE})
+
 CPMAddPackage(
   NAME utempl
   URL "https://github.com/linuxnyasha/utempl/archive/refs/heads/main.zip"
+  EXCLUDE_FROM_ALL ON
   OPTIONS "ENABLE_TESTS OFF" "ENABLE_EXAMPLES OFF"
 )
+set(CPM_USE_LOCAL_PACKAGES ${TMP})
 
 
 
diff --git a/examples/src/cli.cpp b/examples/src/cli.cpp
index e3301a4..46ea92a 100644
--- a/examples/src/cli.cpp
+++ b/examples/src/cli.cpp
@@ -5,7 +5,7 @@
 
 struct SomeStruct {
   static_assert(utempl::OpenStruct<SomeStruct>());
-  utempl::FieldAttribute<std::string, cserver::cli::Name<"field,f">> field;
+  utempl::FieldAttribute<std::string, utempl::TypeList<cserver::cli::Name<"field,f">>> field;
   static_assert(utempl::CloseStruct<SomeStruct>());
 };
 
diff --git a/include/cserver/components/cli/manager.hpp b/include/cserver/components/cli/manager.hpp
index 23a1c1f..4ca1eda 100644
--- a/include/cserver/components/cli/manager.hpp
+++ b/include/cserver/components/cli/manager.hpp
@@ -78,7 +78,7 @@ struct Manager {
         if(this->variableMap.count(name.begin())) {
           return this->variableMap[name.begin()].template as<typename decltype(fieldConfig)::Type>();
         };
-        throw std::runtime_error(fmt::format("Not found cli option {}", name));
+        throw std::runtime_error(fmt::format("Not found cli option {}", name.begin()));
       }()...};
     } | utempl::kSeq<utempl::kTupleSize<decltype(fieldConfigs)>>;
   };