Quellcode durchsuchen

update cjson (#476)

* update cjson

* fix cjson
Hoildkv vor 4 Jahren
Ursprung
Commit
30dc3f79aa
1 geänderte Dateien mit 9 neuen und 5 gelöschten Zeilen
  1. 9 5
      packages/c/cjson/xmake.lua

+ 9 - 5
packages/c/cjson/xmake.lua

@@ -6,13 +6,17 @@ package("cjson")
     set_urls("https://github.com/DaveGamble/cJSON/archive/v$(version).zip",
     set_urls("https://github.com/DaveGamble/cJSON/archive/v$(version).zip",
              "https://github.com/DaveGamble/cJSON.git")
              "https://github.com/DaveGamble/cJSON.git")
     add_versions("1.7.10", "80a0584410656c8d8da2ba703744f44d7535fc4f0778d8bf4f980ce77c6a9f65")
     add_versions("1.7.10", "80a0584410656c8d8da2ba703744f44d7535fc4f0778d8bf4f980ce77c6a9f65")
+    add_versions("1.7.14", "d797b4440c91a19fa9c721d1f8bab21078624aa9555fc64c5c82e24aa2a08221")
 
 
-    on_install("macosx", "linux", "iphoneos", "android", function (package)
-        import("package.tools.make").build(package, {"static"})
-        os.cp("*.a", package:installdir("lib"))
-        os.cp("*.h", package:installdir("include"))
+    add_deps("cmake")
+
+    on_install("windows", "macosx", "linux", "iphoneos", "android", function (package)
+        local configs = {"-DENABLE_CJSON_TEST=OFF"}
+        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
+        table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
+        import("package.tools.cmake").install(package, configs)
     end)
     end)
 
 
     on_test(function (package)
     on_test(function (package)
-        assert(package:has_cfuncs("cJSON_malloc", {includes = "cJSON.h"}))
+        assert(package:has_cfuncs("cJSON_malloc", {includes = "cjson/cJSON.h"}))
     end)
     end)