Browse Source

fix: abseil conflict (#3706)

* fix: abseil conflict

* fix: remove all cxx_standard

* refact: use add_deps
Mogg 1 year ago
parent
commit
8daecce6cd
3 changed files with 3 additions and 3 deletions
  1. 1 1
      packages/a/abseil/xmake.lua
  2. 1 1
      packages/g/grpc/xmake.lua
  3. 1 1
      packages/p/protobuf-cpp/xmake.lua

+ 1 - 1
packages/a/abseil/xmake.lua

@@ -17,7 +17,7 @@ package("abseil")
 
 
     add_deps("cmake")
     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
     if is_plat("macosx") then
         add_frameworks("CoreFoundation")
         add_frameworks("CoreFoundation")

+ 1 - 1
packages/g/grpc/xmake.lua

@@ -23,7 +23,7 @@ package("grpc")
         add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
         add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
     end
     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
     if is_plat("linux") then
         add_syslinks("pthread", "dl", "m")
         add_syslinks("pthread", "dl", "m")

+ 1 - 1
packages/p/protobuf-cpp/xmake.lua

@@ -46,7 +46,7 @@ package("protobuf-cpp")
             package:add("deps", "zlib")
             package:add("deps", "zlib")
         end
         end
         if package:version():ge("22.0") then
         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
     end)
     end)