[all] fixes with ulib version and vcpkg version

osdeverr · Nov 29, 2024 · 408bc9d · 408bc9d
1 parent 1644a5d
commit 408bc9d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/buildkit/re/build/default_build_context.cpp b/buildkit/re/build/default_build_context.cpp
@@ -40,7 +40,7 @@
 
 #include <fstream>
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 #include <unordered_set>
 
 #include <futile/futile.h>

diff --git a/buildkit/re/deps/re_package_dep_resolver.cpp b/buildkit/re/deps/re_package_dep_resolver.cpp
@@ -3,7 +3,7 @@
 #include <re/deps_version_cache.h>
 #include <re/target.h>
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 namespace re
 {

diff --git a/buildkit/re/deps/vcpkg_dep_resolver.cpp b/buildkit/re/deps/vcpkg_dep_resolver.cpp
@@ -234,7 +234,10 @@ namespace re
             if (features->is_sequence())
                 for (auto feature : *features)
                 {
-                    append_deps_from(vcpkg_json["features"][feature.scalar()]);
+                    // fmt::print("features: \n{}\n", vcpkg_json["features"].dump());
+                    // fmt::print("feature: \n{}\n", feature.dump());
+
+                    append_deps_from(vcpkg_json["features"][feature.is_map() ? feature["name"].scalar() : feature.scalar()]);
                 }
 
         package_target->root_path = target.root_path;

diff --git a/buildkit/re/packages/re_package_client.cpp b/buildkit/re/packages/re_package_client.cpp
@@ -1,7 +1,7 @@
 #include "re_package_client.h"
 #include "re/packages/re_package_client.h"
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include <nlohmann/json.hpp>
 

diff --git a/buildkit/re/target.cpp b/buildkit/re/target.cpp
@@ -1,6 +1,6 @@
 #include "target.h"
 
-#include <magic_enum.hpp>
+#include <magic_enum/magic_enum.hpp>
 
 #include <fstream>
 #include <re/fs.h>

diff --git a/re-deps-lock.json b/re-deps-lock.json
@@ -6,8 +6,8 @@
     "github:k2rate/ulib-process^v1.0.2": "v1.0.3",
     "github:k2rate/ulib-yaml-json^1.0.0": "v1.1.0",
     "github:k2rate/ulib-yaml^1.0.0": "v1.0.2",
-    "github:k2rate/ulib^5.0.0": "v5.10.1",
-    "github:k2rate/ulib^5.0.1": "v5.10.1",
+    "github:k2rate/ulib^5.0.0": "v5.13.3",
+    "github:k2rate/ulib^5.0.1": "v5.13.3",
     "github:osdeverr/futile^3.0.0": "v3.1.4",
     "github:osdeverr/ulib-env^1.0.0": "v1.0.0"
 }