Browse Source

rendergraph: update to v2.1.0 (#8511)

* update

* add version

* Update xmake.lua

* fix missing header in v2.0.0

* fix win static test

---------

Co-authored-by: star9029 <[email protected]>
Willaaaaaaa 1 month ago
parent
commit
7f04fd894b
1 changed files with 15 additions and 12 deletions
  1. 15 12
      packages/r/rendergraph/xmake.lua

+ 15 - 12
packages/r/rendergraph/xmake.lua

@@ -1,11 +1,13 @@
 package("rendergraph")
-
     set_homepage("https://github.com/DragonJoker/RenderGraph/")
     set_description("Vulkan render graph management library.")
     set_license("MIT")
 
     set_urls("https://github.com/DragonJoker/RenderGraph/archive/refs/tags/$(version).tar.gz",
-         "https://github.com/DragonJoker/RenderGraph.git")
+             "https://github.com/DragonJoker/RenderGraph.git")
+
+    add_versions("v2.1.0", "a496e0b04944edd52cb6f131877559314a9d43e6964567a5d613df1989da0cb2")
+    add_versions("v2.0.0", "9ab5bf4ef16fac2bec8633b1634843c97e3e244a556be62c942348e2462d0888")
     add_versions("v1.4.1", "7096a6384165f98ec3fab995deba10523b42a4f170f9ad9473107bc03eb50a3d")
     add_versions("v1.4.0", "0009eac85885231069f7ba644d22a801e71505cc")
     add_versions("v1.3.0", "b9c68b6949c7b60ffb49f9b9997432aac5baec69")
@@ -15,7 +17,11 @@ package("rendergraph")
 
     add_deps("vulkan-headers")
 
-    add_links("RenderGraph")
+    on_load("windows", function (package)
+        if not package:config("shared") then
+            package:add("defines", "CRG_BUILD_STATIC")
+        end
+    end)
 
     on_install("windows|x64", "macosx", "linux", function (package)
         io.writefile("xmake.lua", [[
@@ -25,7 +31,7 @@ package("rendergraph")
                 set_kind("$(kind)")
                 add_includedirs("include")
                 add_files("source/RenderGraph/**.cpp")
-                set_languages("c++17")
+                set_languages("c++20")
                 if is_plat("windows") then
                     if is_kind("shared") then
                         add_defines("RenderGraph_EXPORTS")
@@ -34,23 +40,20 @@ package("rendergraph")
                     end
                 end
                 add_headerfiles("include/(RenderGraph/**.hpp)")
+                add_headerfiles("include/RenderGraph/PixelFormat.inl")
+                add_headerfiles("include/RenderGraph/PixelFormat.enum")
                 add_packages("vulkan-headers")
         ]])
-        local configs = {}
-        if package:config("shared") then 
-            configs.kind = "shared"
-        end
-        import("package.tools.xmake").install(package, configs)
+        import("package.tools.xmake").install(package)
     end)
 
     on_test(function (package)
         assert(package:check_cxxsnippets({test = [[
-            static void test()
-            {
+            void test() {
                 crg::ResourceHandler handler;
                 crg::FrameGraph graph{ handler, "test" };
             }
-        ]]}, {configs = {languages = "cxx17"},
+        ]]}, {configs = {languages = "cxx20"},
             includes = {
                 "RenderGraph/FrameGraph.hpp",
                 "RenderGraph/ResourceHandler.hpp"}}))