UPD | windows support #2

Author: xiadnoring

CMakeLists.txt

@@ -579,7 +579,6 @@ string(REPLACE "{{ VAR_MANAPIHTTP_NGHTTP3_DEPENDENCY }}" $<BOOL:${MANAPIHTTP_NGH
 string(REPLACE "{{ VAR_MANAPIHTTP_CPPTRACE_DEPENDENCY }}" $<BOOL:${MANAPIHTTP_CPPTRACE_DEPENDENCY}> TEXT "${TEXT}")
 string(REPLACE "{{ VAR_MANAPIHTTP_STD_BACKTRACE_DEPENDENCY }}" $<BOOL:${MANAPIHTTP_STD_BACKTRACE_DEPENDENCY}> TEXT "${TEXT}")
 string(REPLACE "{{ VAR_MANAPIHTTP_IS_SHARED }}" $<BOOL:${BUILD_SHARED_LIBS}> TEXT "${TEXT}")
-
 file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/ManapiParams.hpp" CONTENT "${TEXT}")
 set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/ManapiParams.hpp")
 
@@ -960,7 +959,17 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads ${CMAKE_DL_LIBS})
 
 if (MANAPIHTTP_BUILD_METHOD STREQUAL "conan")
     get_target_property(LIBUV_INCLUDE_DIRECTORIES uv INTERFACE_INCLUDE_DIRECTORIES)
-    message(STATUS "${LIBUV_INCLUDE_DIRECTORIES}")
+    
+    message(STATUS ${libuv_CONAN_INCLUDE_DIRS})
+    if (NOT EXISTS "${CMAKE_BINARY_DIR}/include/ext/uv.h")
+        file(COPY ${libuv_CONAN_INCLUDE_DIRS}/uv DESTINATION ${CMAKE_BINARY_DIR}/include/ext FILES_MATCHING PATTERN "*.h")
+        file(COPY ${libuv_CONAN_INCLUDE_DIRS}/uv.h DESTINATION ${CMAKE_BINARY_DIR}/include/ext FILES_MATCHING PATTERN "*.h")
+    endif()
+
+    if (NOT EXISTS "${CMAKE_BINARY_DIR}/include/ext/uv.h")
+        message( FATAL_ERROR "Failed to copy uv.h from ${libuv_CONAN_INCLUDE_DIRS}" )
+    endif()
+
     target_link_libraries (${PROJECT_NAME} PUBLIC uv)
 
     if (MANAPIHTTP_BUILD_TYPE STREQUAL "exe")
@@ -1120,7 +1129,10 @@ else ()
         target_include_directories(${PROJECT_NAME} PUBLIC ${CPPTRACE_INCLUDE_DIRS})
     endif ()
 
-
+    if (NOT EXISTS "${CMAKE_BINARY_DIR}/include/uv.h")
+        file(COPY ${LIBUV_INCLUDE_DIRS}/uv DESTINATION ${CMAKE_BINARY_DIR}/include/ext FILES_MATCHING PATTERN "*.h")
+        file(COPY ${LIBUV_INCLUDE_DIRS}/uv.h DESTINATION ${CMAKE_BINARY_DIR}/include/ext FILES_MATCHING PATTERN "*.h")
+    endif()
 endif ()
 
 if (MANAPIHTTP_GMP_DEPENDENCY_FETCH)

conanfile.py

@@ -103,10 +103,6 @@ def layout(self):
         cmake_layout(self)
 
     def generate(self):
-        for dep in self.dependencies.values():
-            print("BINDIR PATH", dep.cpp_info.libdir)
-            copy(self, "*.dll", dep.cpp_info.libdir, os.path.join(self.build_folder, 'bin'))
-    
         VirtualBuildEnv(self).generate()
 
         runenv = VirtualRunEnv(self)
@@ -130,6 +126,13 @@ def generate(self):
         tc.variables['MANAPIHTTP_NGHTTP3_DEPENDENCY'] = self.options.get_safe('nghttp3_dependency', False)
         tc.variables['MANAPIHTTP_CPPTRACE_DEPENDENCY'] = self.options.get_safe('cpptrace_dependency', False)
         tc.variables['MANAPIHTTP_BUILD_TYPE'] = 'lib' if self.options.get_safe('lib', False) else 'exe'
+        
+        for [key, dep] in self.dependencies.items():
+            p = dep.cpp_info.includedir
+            if (self.settings.os == "Windows"):
+                p = p.replace('\\', '\\\\')
+            tc.variables[f"{str(key).split('/')[0]}_CONAN_INCLUDE_DIRS"] = p
+
         tc.cache_variables["CMAKE_TRY_COMPILE_CONFIGURATION"] = str(self.settings.build_type)
         tc.generate()
 

include/ManapiEventStructures.hpp

@@ -3,7 +3,7 @@
 #include <type_traits>
 #include <memory>
 
-#include <uv.h>
+#include "ext/uv.h"
 
 #include "./ManapiUtils.hpp"
 #include "./ManapiErrors.hpp"

include/json/ManapiJsonBuilder.hpp

@@ -6,6 +6,7 @@
 #include "../ManapiUtils.hpp"
 #include "./ManapiJson.hpp"
 #include "./ManapiJsonMask.hpp"
+#include "../ManapiEventStructures.hpp"
 
 namespace manapi {
     class json_builder {
@@ -72,7 +73,7 @@ namespace manapi {
         size_t i;
         int action;
 
-        std::unique_ptr<std::vector<std::string_view>> path;
+        std::unique_ptr<std::vector<ev::buff_t>> path;
         const json *current_types;
         size_t current_type;
 

include/json/ManapiJsonMask.hpp

@@ -2,6 +2,7 @@
 
 #include "../ManapiErrors.hpp"
 #include "../ManapiUtils.hpp"
+#include "../ManapiEventStructures.hpp"
 #include "./ManapiJson.hpp"
 
 namespace manapi {
@@ -116,6 +117,6 @@ namespace manapi {
 
         static void initial_resolve_information (json &obj);
 
-        [[nodiscard]] manapi::json_error::status recursive_valid (const json &obj, const json &information, bool is_complex, std::vector<std::string_view> *path) const;
+        MANAPIHTTP_NODISCARD manapi::json_error::status recursive_valid (const json &obj, const json &information, bool is_complex, std::vector<ev::buff_t> *path) const;
     };
 }

include/std/ManapiBuffer.hpp

@@ -3,7 +3,7 @@
 #include <typeinfo>
 #include <cstdint>
 
-#include "uv.h"
+#include "ext/uv.h"
 
 #include "../ManapiErrors.hpp"