diff options
| -rw-r--r-- | repo/packages/g/gsl-lite/xmake.lua | 23 | ||||
| -rw-r--r-- | src/zencore/xmake.lua | 2 | ||||
| -rw-r--r-- | src/zennet/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake.lua | 2 |
4 files changed, 5 insertions, 26 deletions
diff --git a/repo/packages/g/gsl-lite/xmake.lua b/repo/packages/g/gsl-lite/xmake.lua deleted file mode 100644 index 9656b8de9..000000000 --- a/repo/packages/g/gsl-lite/xmake.lua +++ /dev/null @@ -1,23 +0,0 @@ -package("gsl-lite") - set_kind("library", {headeronly = true}) - set_homepage("https://github.com/gsl-lite/gsl-lite") - set_description("gsl-lite – A single-file header-only version of ISO C++ Guidelines Support Library (GSL) for C++98, C++11, and later") - set_license("MIT") - - add_urls("https://github.com/gsl-lite/gsl-lite/archive/refs/tags/$(version).tar.gz", - "https://github.com/gsl-lite/gsl-lite.git") - - add_versions("v0.41.0", "4682d8a60260321b92555760be3b9caab60e2a71f95eddbdfb91e557ee93302a") - - add_deps("cmake") - - on_install(function (package) - import("package.tools.cmake").install(package, configs) - end) - - on_test(function (package) - assert(package:check_cxxsnippets({test = [[ - #include <gsl/gsl-lite.hpp> - void test(gsl::not_null<int*> p) {} - ]]}, {configs = {languages = "c++11"}})) - end) diff --git a/src/zencore/xmake.lua b/src/zencore/xmake.lua index 09aafe6b3..a79868333 100644 --- a/src/zencore/xmake.lua +++ b/src/zencore/xmake.lua @@ -43,7 +43,7 @@ target('zencore') add_packages( "vcpkg::eastl", - "gsl-lite", + "vcpkg::gsl-lite", "lz4", "xxhash", {public=true} diff --git a/src/zennet/xmake.lua b/src/zennet/xmake.lua index 104cdfa0d..b44878acc 100644 --- a/src/zennet/xmake.lua +++ b/src/zennet/xmake.lua @@ -7,4 +7,6 @@ target('zennet') add_files("**.cpp") add_includedirs("include", {public=true}) add_deps("zencore", "zenutil", "asio") - add_packages("gsl-lite") + add_packages( + "vcpkg::gsl-lite" + ) @@ -8,11 +8,11 @@ add_requires("xxhash 0.8.2", {system = false}) add_requires("lz4", {system = false}) add_requires("lua", {system = false}) add_requires("http_parser", {system = false}) -add_requires("gsl-lite", {system = false}) add_requires( "vcpkg::curl", "vcpkg::eastl", + "vcpkg::gsl-lite", "vcpkg::ryml", "vcpkg::c4core", "vcpkg::zlib" |