summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-12-24 00:04:41 +0800
committerruki <[email protected]>2020-12-24 00:04:41 +0800
commite2b5ecc20e1a78351ceb1e123299fd5b91d75a4f (patch)
tree3b63b45c1877cccee55fe5c1217e53ddc5171741
parent414e6f39860680b693263fd97daa77c48dc5e143 (diff)
improve vsxmake
-rw-r--r--xmake/plugins/project/vsxmake/getinfo.lua8
1 files changed, 5 insertions, 3 deletions
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index a3a978111..b31f9a729 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -31,6 +31,7 @@ import("core.cache.memcache")
import("core.cache.localcache")
import("lib.detect.find_tool")
import("private.action.run.make_runenvs")
+import("actions.require.install", {alias = "install_requires", rootdir = os.programdir()})
import("actions.config.configheader", {alias = "generate_configheader", rootdir = os.programdir()})
import("actions.config.configfiles", {alias = "generate_configfiles", rootdir = os.programdir()})
@@ -308,11 +309,12 @@ function main(outputdir, vsinfo)
-- check project options
project.check()
- -- re-generate configheader
- generate_configheader()
+ -- install and update requires
+ install_requires()
- -- re-generate configfiles
+ -- update config files
generate_configfiles()
+ generate_configheader()
-- ensure to enter project directory
os.cd(project.directory())