diff options
| author | Arthur LAURENT <[email protected]> | 2022-12-14 16:37:06 +0100 |
|---|---|---|
| committer | Arthur LAURENT <[email protected]> | 2022-12-14 17:57:18 +0100 |
| commit | edcda9c35c05a90c1e6e110b559de69d78d1cc06 (patch) | |
| tree | 8513af54a0d0dd2dbae0a06ff07d2571815f17c0 /tests/projects/c++/modules/test_msvc.lua | |
| parent | 5dce8f69e3c7b3130bafb631c67529f4c0474955 (diff) | |
remove old msvc modules preview
Diffstat (limited to 'tests/projects/c++/modules/test_msvc.lua')
| -rw-r--r-- | tests/projects/c++/modules/test_msvc.lua | 43 |
1 files changed, 10 insertions, 33 deletions
diff --git a/tests/projects/c++/modules/test_msvc.lua b/tests/projects/c++/modules/test_msvc.lua index 6295a3ed7..a436b5814 100644 --- a/tests/projects/c++/modules/test_msvc.lua +++ b/tests/projects/c++/modules/test_msvc.lua @@ -2,34 +2,6 @@ import("lib.detect.find_tool") import("core.base.semver") import("core.tool.toolchain") -function stdifcdir_support() - if is_subhost("windows") then - local stdifcdir - local msvc = toolchain.load("msvc") - if msvc and msvc:check() then - local vcvars = msvc:config("vcvars") - if vcvars and vcvars.VCInstallDir and vcvars.VCToolsVersion then - stdifcdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "ifc") - end - end - return os.isdir(stdifcdir or "") - end -end - -function stdimport_support() - if is_subhost("windows") then - local stdmodulesdir - local msvc = toolchain.load("msvc") - if msvc and msvc:check() then - local vcvars = msvc:config("vcvars") - if vcvars and vcvars.VCInstallDir and vcvars.VCToolsVersion then - stdmodulesdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "modules") - end - end - return os.isdir(stdmodulesdir or "") - end -end - function _build() local ci = (os.getenv("CI") or os.getenv("GITHUB_ACTIONS") or ""):lower() if ci == "true" then @@ -41,11 +13,16 @@ end function main(t) if is_subhost("windows") then - local stdifcdir_flag = stdifcdir_support() and "--stdifcsupport=y" - local stdimport_flag = stdimport_support() and "--stdimportsupport=y" - if stdifcdir_flag or stdimport then - os.execv("xmake", table.join({"f", "-c"}, stdifcdir_flag or {}, stdimport_flag or {})) - _build() + local msvc = toolchain.load("msvc") + if msvc and msvc:check() then + local vcvars = msvc:config("vcvars") + if vcvars and vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.35") then + local stdmodulesdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "modules") + if os.isdir(stdmodulesdir) then + os.exec("xmake f -c") + _build() + end + end end end end |