From 77c028d2a67bf8ffe9adeeb80db1dbc42e9355c5 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 16 Aug 2023 09:04:05 +0800 Subject: Update msvc.lua --- xmake/rules/c++/modules/modules_support/msvc.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xmake/rules') diff --git a/xmake/rules/c++/modules/modules_support/msvc.lua b/xmake/rules/c++/modules/modules_support/msvc.lua index 2822c8949..393c38904 100644 --- a/xmake/rules/c++/modules/modules_support/msvc.lua +++ b/xmake/rules/c++/modules/modules_support/msvc.lua @@ -137,7 +137,7 @@ function load(target) local modulesflag = get_modulesflag(target) local msvc = target:toolchain("msvc") local vcvars = msvc:config("vcvars") - if vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.29") == -1 then + if vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.29") < 0 then target:add("cxxflags", modulesflag) end @@ -159,7 +159,7 @@ function load(target) local msvc = target:toolchain("msvc") if msvc then local vcvars = msvc:config("vcvars") - if vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.35") then + if vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.35") > 0 then stdmodulesdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "modules") end end @@ -612,7 +612,7 @@ function get_modulesflag(target) end local msvc = target:toolchain("msvc") local vcvars = msvc:config("vcvars") - if vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.29") == -1 then + if vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.29") < 0 then assert(modulesflag, "compiler(msvc): does not support c++ module!") end _g.modulesflag = modulesflag or false -- cgit v1.3.1