diff --git a/packages/i/inja/xmake.lua b/packages/i/inja/xmake.lua index 7f0bf3482..ce66a3d74 100644 --- a/packages/i/inja/xmake.lua +++ b/packages/i/inja/xmake.lua @@ -1,19 +1,25 @@ package("inja") - + set_kind("library", {headeronly = true}) set_homepage("https://pantor.github.io/inja/") set_description("A Template Engine for Modern C++") set_license("MIT") - add_urls("https://github.com/pantor/inja/archive/$(version).tar.gz", + add_urls("https://github.com/pantor/inja/archive/refs/tags/$(version).tar.gz", "https://github.com/pantor/inja.git") - add_versions("v2.1.0", "038ecde8f6dbad5d3cedb6ceb0853fd0e488d5dc57593a869633ecb30b0dfa6e") add_versions("v3.4.0", "7155f944553ca6064b26e88e6cae8b71f8be764832c9c7c6d5998e0d5fd60c55") + add_versions("v2.1.0", "038ecde8f6dbad5d3cedb6ceb0853fd0e488d5dc57593a869633ecb30b0dfa6e") - add_deps("nlohmann_json") + add_deps("cmake") + add_deps("nlohmann_json", {configs = {cmake = true}}) - on_install(function (package) - os.cp("single_include/inja", package:installdir("include")) + on_install("!wasm", function (package) + import("package.tools.cmake").install(package, { + "-DINJA_INSTALL=ON", + "-DINJA_USE_EMBEDDED_JSON=OFF", + "-DBUILD_TESTING=OFF", + "-DBUILD_BENCHMARK=OFF" + }) end) on_test(function (package) diff --git a/scripts/test.lua b/scripts/test.lua index 15196826d..604affff2 100644 --- a/scripts/test.lua +++ b/scripts/test.lua @@ -235,9 +235,6 @@ function get_modified_packages() if #packages > 0 and version then local lastpackage = packages[#packages] local splitinfo = lastpackage:split("%s+") - if #splitinfo == 1 then - table.remove(packages) - end table.insert(packages, splitinfo[1] .. " " .. version) end end