From 18b68e6e7ab221b5ebd6c992bd02fa11c73d52ae Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 1 Jan 2021 22:33:43 +0800 Subject: use add_requireconfs --- tests/projects/package/depconfigs/xmake.lua | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'tests/projects/package') diff --git a/tests/projects/package/depconfigs/xmake.lua b/tests/projects/package/depconfigs/xmake.lua index 33af8338a..7bf8eba87 100644 --- a/tests/projects/package/depconfigs/xmake.lua +++ b/tests/projects/package/depconfigs/xmake.lua @@ -1,11 +1,10 @@ -add_requires("libpng", {system = false, configs = {vs_runtime = "MD"}, - after_load = function (package) - --package:set("deps", "zlib 1.2.10", {system = false, configs = {cxflags = "-DTEST"}}) - package:extraconf_set("deps", "zlib", {system = false, configs = {cxflags = "-DTEST"}}) - end}) +add_requires("libpng", "libtiff", {system = false, configs = {vs_runtime = "MD"}}) +add_requires("libwebp") -add_requires("libtiff", {system = false, configs = {vs_runtime = "MD"}, - deps = {system = false, configs = {cxflags = "-DTEST2"}}}) +add_requireconfs("libwebp", {system = false, configs = {vs_runtime = "MD"}}) +add_requireconfs("libpng.zlib", {system = false, configs = {cxflags = "-DTEST1"}}) +add_requireconfs("libtiff.zlib", {system = false, configs = {cxflags = "-DTEST2"}}) +add_requireconfs("libwebp.*", {system = false, configs = {cxflags = "-DTEST3"}}) target("test") set_kind("binary") @@ -16,3 +15,9 @@ target("test2") set_kind("binary") add_files("src/*.c") add_packages("libtiff") + +target("test3") + set_kind("binary") + add_files("src/*.c") + add_packages("libwebp") + -- cgit v1.3.1