fix: abseil conflict (#3706)

* fix: abseil conflict

* fix: remove all cxx_standard

* refact: use add_deps
pull/3714/head
Mogg 8 months ago committed by GitHub
parent 32fae29e84
commit 8daecce6cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      packages/a/abseil/xmake.lua
  2. 2
      packages/g/grpc/xmake.lua
  3. 2
      packages/p/protobuf-cpp/xmake.lua

@ -17,7 +17,7 @@ package("abseil")
add_deps("cmake")
add_configs("cxx_standard", {description = "Select c++ standard to build.", default = "14", type = "string", values = {"14", "17", "20"}})
add_configs("cxx_standard", {description = "Select c++ standard to build.", default = "17", type = "string", values = {"14", "17", "20"}})
if is_plat("macosx") then
add_frameworks("CoreFoundation")

@ -23,7 +23,7 @@ package("grpc")
add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
end
add_deps("c-ares", "re2", "abseil", "protobuf-cpp", "openssl", "zlib")
add_deps("c-ares", "re2", "protobuf-cpp", "openssl", "zlib", "abseil")
if is_plat("linux") then
add_syslinks("pthread", "dl", "m")

@ -46,7 +46,7 @@ package("protobuf-cpp")
package:add("deps", "zlib")
end
if package:version():ge("22.0") then
package:add("deps", "abseil", {configs = {cxx_standard = (package:is_plat("linux") and "17" or "14")}})
package:add("deps", "abseil")
end
end)

Loading…
Cancel
Save