diff options
| author | ruki <[email protected]> | 2020-12-17 00:31:32 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-12-17 00:31:32 +0800 |
| commit | 83e09c0fa0ea1cc9b40860d9f58676b0a4f12a38 (patch) | |
| tree | 55690d33c8bcc61679c3181fe3c02f1a46aac0b2 | |
| parent | 2fb94d278e31d0e10870317a4534891148921a0f (diff) | |
fix ci
| -rw-r--r-- | tests/plugins/project/test.lua | 3 | ||||
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x.lua | 7 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/getinfo.lua | 7 |
3 files changed, 5 insertions, 12 deletions
diff --git a/tests/plugins/project/test.lua b/tests/plugins/project/test.lua index 5cc1e7e0e..30fbe323b 100644 --- a/tests/plugins/project/test.lua +++ b/tests/plugins/project/test.lua @@ -21,8 +21,7 @@ function test_vsxmake(t) -- set config local arch = os.getenv("platform") or "x86" config.set("arch", arch, {readonly = true, force = true}) - config.check() - platform.load(config.plat()) + platform.load(config.plat()):check() -- create sln & vcxproj local vs = config.get("vs") diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index f29f77124..7bc9f9d45 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -237,15 +237,12 @@ function make(outputdir, vsinfo) -- clear project to reload and recheck it project.clear() - -- check configure - config.check() + -- check platform + platform.load(config.plat()):check() -- check project options project.check() - -- reload platform - platform.load(config.plat()) - -- re-generate configheader generate_configheader() end diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index 96b4e18ba..0ba11514c 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -296,15 +296,12 @@ function main(outputdir, vsinfo) -- clear project to reload and recheck it project.clear() - -- check configure - config.check() + -- check platform + platform.load(config.plat()):check() -- check project options project.check() - -- reload platform - platform.load(config.plat()) - -- re-generate configheader generate_configheader() |