From 383589126e9053d5e52e1db9e67961c5ede99698 Mon Sep 17 00:00:00 2001 From: "Tim.Ebbeke" Date: Wed, 4 Dec 2024 17:04:06 +0100 Subject: [PATCH 1/2] Fixed build issue with some nlohmann json versions. --- tools/parcel_adapter/main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/parcel_adapter/main.cpp b/tools/parcel_adapter/main.cpp index db990ca..28c34f6 100644 --- a/tools/parcel_adapter/main.cpp +++ b/tools/parcel_adapter/main.cpp @@ -21,7 +21,7 @@ std::string readFile(std::ifstream& ifs) void disablePolyfillIfNotSet(nlohmann::json& alias, std::string_view aliasName) { if (!alias.contains(aliasName)) - alias[aliasName] = false; + alias[std::string{aliasName}] = false; } void addNuiAlias(nlohmann::json& alias) @@ -58,7 +58,8 @@ int main(int argc, char** argv) { std::cout << "Expected 3 argument: , but got " << argc - 1 << "\n"; - std::cout << "Usage: " << argv[0] << " " << "\n"; + std::cout << "Usage: " << argv[0] << " " + << "\n"; return 1; } From e4948cf0a72ed2563c6087cdee1c585014ad6aa4 Mon Sep 17 00:00:00 2001 From: "Tim.Ebbeke" Date: Wed, 4 Dec 2024 17:08:24 +0100 Subject: [PATCH 2/2] feat: Update roar tag --- cmake/dependencies/roar.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies/roar.cmake b/cmake/dependencies/roar.cmake index a502286..e618711 100644 --- a/cmake/dependencies/roar.cmake +++ b/cmake/dependencies/roar.cmake @@ -1,6 +1,6 @@ option(NUI_FETCH_ROAR "Fetch roar" ON) set(NUI_ROAR_REPOSITORY "https://github.com/5cript/roar.git" CACHE STRING "roar repository") -set(NUI_ROAR_TAG "a8eda5bc6d4800a8f389a3007e793eb233ea6192" CACHE STRING "roar tag") +set(NUI_ROAR_TAG "f1ff8911bdc1d49bc118def679638227337a0e20" CACHE STRING "roar tag") if(NUI_FETCH_ROAR) include(FetchContent)