Merge branch 'patch-1' of github.com:chriku/xmake-repo into patch-1

xmake-io · Jan 31, 2025 · bb3472a · bb3472a
2 parents 4ca9798 + ca01e2e
commit bb3472a
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/packages/c/capnproto/xmake.lua b/packages/c/capnproto/xmake.lua
@@ -13,26 +13,16 @@ package("capnproto")
     add_versions("0.8.0", "9a5e090b1f3ad39bb47fed5fd03672169493674ce273418b76c868393fced2e4")
     add_versions("0.7.0", "1054a879e174b8f797f1b506fedb14ecba5556c656e33ac51bd0a62bd90f925f")
 
-    add_linkorders("capnpc", "capnp-json")
-    add_linkorders("capnpc", "capnp-rpc")
-    add_linkorders("capnp-json", "capnp")
-    add_linkorders("capnp-json", "kj-http")
-    add_linkorders("capnp-rpc", "capnp")
-    add_linkorders("capnp-rpc", "kj-http")
-    add_linkorders("capnp", "kj-test")
-    add_linkorders("capnp", "kj-http")
-    add_linkorders("capnp", "kj-async")
-    add_linkorders("kj-async", "kj")
-    add_linkorders("kj-test", "kj")
-    add_linkorders("kj-gzip", "kj-async")
-    add_linkorders("kj-tls", "kj-async")
-    add_linkorders("kj-http", "kj-async")
+    add_links("capnpc", "capnp-json", "capnp", "capnp-websocket", "capnp-rpc")
+    add_links("kj-gzip", "kj-async", "kj-http", "kj", "kj-test", "kj-tls")
 
     if is_plat("windows") then
         add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
     end
     if is_plat("windows", "mingw") then
         add_syslinks("ws2_32")
+    elseif is_plat("linux", "bsd") then
+        add_syslinks("pthread")
     end
 
     add_deps("cmake", "zlib")
@@ -58,5 +48,15 @@ package("capnproto")
     end)
 
     on_test(function (package)
-        assert(package:has_cxxtypes("capnp::MallocMessageBuilder", {configs = {languages = "c++14"}, includes = "capnp/message.h"}))
+        assert(package:has_cxxtypes("capnp::MallocMessageBuilder",
+            {configs = {languages = "c++14"}, includes = "capnp/message.h"}))
+    end)
+
+    on_test(function (package)
+        assert(package:check_cxxsnippets({test = [[
+            #include "capnp/message.h"
+            void test() {
+                capnp::MallocMessageBuilder message;
+            }
+        ]]}, {configs = {languages = "c++14"}}))
     end)