flatbuffers, nng 添加 cross 支持 (#1953)

* add sqlcipher

* sqlcipher on windows

* update sqlchipher

* update sqlcipher

* update sqlcipher

* update sqlchiper

* update sqlcipher

* update sqlcipher

* update sqlcipher

* fixed sqlcipher

* update sqlcipher

* update sqlcipher

* update sqlcipher

* update sqlcipher

* update sqlcipher

* flatbuffers, nng 加入 cross

* update flatbuufers

* nngpp add cross; nng 补充windows下的系统链接库

* update nng
pull/1957/head
fasiondog 2 years ago committed by GitHub
parent 5e3b00095e
commit 0f485bf24d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      packages/f/flatbuffers/xmake.lua
  2. 4
      packages/n/nng/xmake.lua
  3. 2
      packages/n/nngpp/xmake.lua

@ -11,7 +11,7 @@ package("flatbuffers")
add_versions("v23.1.21", "48597d6a6f8ca67a02ae8d8494b3bfc9136eb93da60a538d5bfc024f7c564f97") add_versions("v23.1.21", "48597d6a6f8ca67a02ae8d8494b3bfc9136eb93da60a538d5bfc024f7c564f97")
add_deps("cmake") add_deps("cmake")
on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", function(package) on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", "cross", function(package)
local configs = {"-DFLATBUFFERS_BUILD_TESTS=OFF"} local configs = {"-DFLATBUFFERS_BUILD_TESTS=OFF"}
table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
table.insert(configs, "-DFLATBUFFERS_BUILD_SHAREDLIB=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DFLATBUFFERS_BUILD_SHAREDLIB=" .. (package:config("shared") and "ON" or "OFF"))
@ -20,7 +20,9 @@ package("flatbuffers")
table.insert(configs, "-DFLATBUFFERS_BUILD_FLATHASH=OFF") table.insert(configs, "-DFLATBUFFERS_BUILD_FLATHASH=OFF")
end end
import("package.tools.cmake").install(package, configs) import("package.tools.cmake").install(package, configs)
package:addenv("PATH", "bin") if not package:is_cross() then
package:addenv("PATH", "bin")
end
end) end)
on_test(function(package) on_test(function(package)

@ -36,6 +36,8 @@ package("nng")
if is_plat("linux") then if is_plat("linux") then
add_syslinks("pthread") add_syslinks("pthread")
elseif is_plat("windows") then
add_syslinks("ws2_32", "advapi32")
end end
on_load(function (package) on_load(function (package)
@ -48,7 +50,7 @@ package("nng")
end) end)
add_deps("cmake") add_deps("cmake")
on_install("windows", "linux", "macosx", "android", "iphoneos", function(package) on_install("windows", "linux", "macosx", "android", "iphoneos", "cross", function(package)
local configs = {"-DNNG_TESTS=OFF", "-DNNG_ENABLE_NNGCAT=OFF"} local configs = {"-DNNG_TESTS=OFF", "-DNNG_ENABLE_NNGCAT=OFF"}
table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
for name, enabled in pairs(package:configs()) do for name, enabled in pairs(package:configs()) do

@ -8,7 +8,7 @@ package("nngpp")
add_deps("nng") add_deps("nng")
add_deps("cmake") add_deps("cmake")
on_install("windows", "linux", "macosx", "android", "iphoneos", function (package) on_install("windows", "linux", "macosx", "android", "iphoneos", "cross", function (package)
import("package.tools.cmake").install(package, configs) import("package.tools.cmake").install(package, configs)
end) end)

Loading…
Cancel
Save