diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-04-24 02:20:06 +0300 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-04-24 02:20:06 +0300 |
| commit | a8bbaf016dc3092f6f6ad0c4a333e595da665983 (patch) | |
| tree | 6b1b74bbca7850ed75da01cba5a72618f3cfa94b /share/qbs/imports/qbs/Probes/MsvcProbe.qbs | |
| parent | 001bf31623c02ba8249dd066777d014d546eb7f9 (diff) | |
| parent | 2f6eecdc96fcd693cecef8011d8f9500c7872fc7 (diff) | |
Merge branch '1.19' into master
Change-Id: Ic6087168a1d93c2a2b46de825f5c3b9655634e8e
Diffstat (limited to 'share/qbs/imports/qbs/Probes/MsvcProbe.qbs')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/MsvcProbe.qbs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/share/qbs/imports/qbs/Probes/MsvcProbe.qbs b/share/qbs/imports/qbs/Probes/MsvcProbe.qbs index 2d5faecdd..d3624e010 100644 --- a/share/qbs/imports/qbs/Probes/MsvcProbe.qbs +++ b/share/qbs/imports/qbs/Probes/MsvcProbe.qbs @@ -38,6 +38,7 @@ PathProbe { property string compilerFilePath property stringList enableDefinesByLanguage property string preferredArchitecture + property string winSdkVersion // Outputs property string architecture @@ -54,9 +55,9 @@ PathProbe { languages = ["c"]; var info = languages.contains("c") - ? Utilities.msvcCompilerInfo(compilerFilePath, "c") : {}; + ? Utilities.msvcCompilerInfo(compilerFilePath, "c", winSdkVersion) : {}; var infoCpp = languages.contains("cpp") - ? Utilities.msvcCompilerInfo(compilerFilePath, "cpp") : {}; + ? Utilities.msvcCompilerInfo(compilerFilePath, "cpp", winSdkVersion) : {}; found = (!languages.contains("c") || (!!info && !!info.macros && !!info.buildEnvironment)) && (!languages.contains("cpp") || |