diff options
| author | ruki <[email protected]> | 2021-01-01 22:35:43 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-01-01 22:35:43 +0800 |
| commit | 3d81bbfbc1d0e4578ac4960585ea6fa6dd655908 (patch) | |
| tree | 1cf4e3b5a5308b4ab0e15a8549dad3742dd9cad8 | |
| parent | 18b68e6e7ab221b5ebd6c992bd02fa11c73d52ae (diff) | |
add multiconfigs2
| -rwxr-xr-x | tests/projects/package/multiconfig2/src/main.c | 7 | ||||
| -rw-r--r-- | tests/projects/package/multiconfig2/test.lua | 3 | ||||
| -rw-r--r-- | tests/projects/package/multiconfig2/xmake.lua | 19 | ||||
| -rw-r--r-- | xmake/actions/require/impl/package.lua | 1 | ||||
| -rw-r--r-- | xmake/core/project/project.lua | 2 |
5 files changed, 30 insertions, 2 deletions
diff --git a/tests/projects/package/multiconfig2/src/main.c b/tests/projects/package/multiconfig2/src/main.c new file mode 100755 index 000000000..9ae580511 --- /dev/null +++ b/tests/projects/package/multiconfig2/src/main.c @@ -0,0 +1,7 @@ +#include <stdio.h> + +int main(int argc, char** argv) +{ + printf("hello world!\n"); + return 0; +} diff --git a/tests/projects/package/multiconfig2/test.lua b/tests/projects/package/multiconfig2/test.lua new file mode 100644 index 000000000..b57362078 --- /dev/null +++ b/tests/projects/package/multiconfig2/test.lua @@ -0,0 +1,3 @@ +function main(t) + t:build() +end diff --git a/tests/projects/package/multiconfig2/xmake.lua b/tests/projects/package/multiconfig2/xmake.lua new file mode 100644 index 000000000..ef6514e32 --- /dev/null +++ b/tests/projects/package/multiconfig2/xmake.lua @@ -0,0 +1,19 @@ +add_requires("zlib", {system = false}) +add_requires("zlib", {system = false}) -- test repeat requires +add_requires("zlib", {system = false, debug = true, alias = "zlib_debug"}) +add_requires("zlib", {system = false, configs = {shared = true}, alias = "zlib_shared"}) + +target("test1") + set_kind("binary") + add_files("src/*.c") + add_packages("zlib") + +target("test2") + set_kind("binary") + add_files("src/*.c") + add_packages("zlib_debug") + +target("test3") + set_kind("binary") + add_files("src/*.c") + add_packages("zlib_shared") diff --git a/xmake/actions/require/impl/package.lua b/xmake/actions/require/impl/package.lua index 4a400bb34..c82542623 100644 --- a/xmake/actions/require/impl/package.lua +++ b/xmake/actions/require/impl/package.lua @@ -443,7 +443,6 @@ function _load_package_depconfigs(package) end end end - print(extraconfs) return extraconfs end diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua index a495a300c..60ba7a0ea 100644 --- a/xmake/core/project/project.lua +++ b/xmake/core/project/project.lua @@ -619,7 +619,7 @@ function project._load_requires() instance._INFO = { __requirestr = requirestr, __extrainfo = extrainfo } end - -- discard scripts in extrainfo, we need not it now (e.g. on_load ..) + -- @deprecated discard scripts in extrainfo, we need not it now (e.g. on_load ..) if extrainfo then for k, v in pairs(extrainfo) do if type(v) == "function" then |
