From 9cad52e31126152d3a1c91e425a82224c75f1b67 Mon Sep 17 00:00:00 2001
From: Arthur Laurent <arthur.laurent4@gmail.com>
Date: Sun, 4 Feb 2024 02:13:40 +0100
Subject: [PATCH] add modules support for vulkan-memory-allocator-hpp (#3229)

* add modules support for vulkan-memory-allocator-hpp

* fix package

* bump c++ version of tests

* fix vulkan-memory-allocator-hpp package
---
 .../v/vulkan-memory-allocator-hpp/xmake.lua   | 44 ++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/packages/v/vulkan-memory-allocator-hpp/xmake.lua b/packages/v/vulkan-memory-allocator-hpp/xmake.lua
index 113de5b3d..537e6bb5e 100644
--- a/packages/v/vulkan-memory-allocator-hpp/xmake.lua
+++ b/packages/v/vulkan-memory-allocator-hpp/xmake.lua
@@ -10,14 +10,48 @@ package("vulkan-memory-allocator-hpp")
     add_versions("v3.0.1-1", '0e0c374751d5ca6123d0ae0df756693f0674412d7c758ec4a39a5a9dcc412911')
     add_versions("v3.0.1-3", '66a3d4be3bc1404c844b5a36aadeb6b366878e7cf1efe899eb0a0095f3871aae')
 
+    add_configs("modules", {description = "Build with C++20 modules support.", default = false, type = "boolean"})
+    add_configs("use_vulkanheaders", {description = "Use vulkan-headers package instead of vulkan-hpp.", default = false, type = "boolean"})
+
     add_deps("vulkan-memory-allocator")
 
     on_install("windows|x86", "windows|x64", "linux", "macosx", "mingw", "android", "iphoneos", function (package)
-        os.cp("include", package:installdir())
-        if package:gitref() or package:version():ge("3.0.1") then
-            package:add("deps", "vulkan-hpp >= 1.3.234")
+        if not package:config("modules") then
+            if package:config("use_vulkanheaders") then
+                if package:gitref() or package:version():ge("3.0.1") then
+                    package:add("deps", "vulkan-headers >= 1.3.234")
+                else
+                    package:add("deps", "vulkan-headers < 1.3.234")
+                end
+            else
+                if package:gitref() or package:version():ge("3.0.1") then
+                    package:add("deps", "vulkan-hpp >= 1.3.234")
+                else
+                    package:add("deps", "vulkan-hpp < 1.3.234")
+                end
+            end
+            os.cp("include", package:installdir())
         else
-            package:add("deps", "vulkan-hpp < 1.3.234")
+            local vulkan_dep
+            if package:config("use_vulkanheaders") then
+                vulkan_dep = "vulkan-headers"
+                package:add("deps", "vulkan-headers >= 1.3.275")
+            else
+                vulkan_dep = "vulkan-hpp"
+                package:add("deps", "vulkan-hpp >= 1.3.275")
+            end
+            io.writefile("xmake.lua", format([[
+                add_requires("vulkan-memory-allocator", "%s >= 1.3.275")
+                target("vulkan-memory-allocator-hpp")
+                    set_kind("static")
+                    set_languages("c++20")
+                    add_headerfiles("include/(**.hpp)")
+                    add_includedirs("include")
+                    add_files("src/*.cppm", {public = true})
+                    add_packages("vulkan-memory-allocator", "%s")
+            ]], vulkan_dep, vulkan_dep))
+            local configs = {}
+            import("package.tools.xmake").install(package, configs)
         end
     end)
 
@@ -26,5 +60,5 @@ package("vulkan-memory-allocator-hpp")
             void test() {
                 int version = VMA_VULKAN_VERSION;
             }
-        ]]}, {includes = "vk_mem_alloc.hpp", configs = {languages = "c++11"} }))
+        ]]}, {includes = "vk_mem_alloc.hpp", configs = {languages = "c++14"} }))
     end)