diff options
| author | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2021-09-23 20:12:51 (GMT) |
|---|---|---|
| committer | Joseph Brill <48932340+jcbrill@users.noreply.github.com> | 2021-09-23 20:12:51 (GMT) |
| commit | c13797579e4ebd0092ae0bc929c0c618f54887bc (patch) | |
| tree | 93e5f27cf7ce88330d2645f21f3a23f483259362 /test/MSVC | |
| parent | a6f3af3310410cfad4d4d010bab90c25a07dafe2 (diff) | |
| download | SCons-c13797579e4ebd0092ae0bc929c0c618f54887bc.zip SCons-c13797579e4ebd0092ae0bc929c0c618f54887bc.tar.gz SCons-c13797579e4ebd0092ae0bc929c0c618f54887bc.tar.bz2 | |
Add support for Visual Studio 2022
Diffstat (limited to 'test/MSVC')
| -rw-r--r-- | test/MSVC/MSVC_UWP_APP.py | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/test/MSVC/MSVC_UWP_APP.py b/test/MSVC/MSVC_UWP_APP.py index 4bb2f5c..ca0bdd7 100644 --- a/test/MSVC/MSVC_UWP_APP.py +++ b/test/MSVC/MSVC_UWP_APP.py @@ -89,8 +89,9 @@ installed_msvc_versions = msvc.get_installed_vcs() msvc_140 = '14.0' in installed_msvc_versions msvc_141 = '14.1' in installed_msvc_versions msvc_142 = '14.2' in installed_msvc_versions +msvc_143 = '14.3' in installed_msvc_versions -if not any((msvc_140, msvc_141, msvc_142)): +if not any((msvc_140, msvc_141, msvc_142, msvc_143)): test.skip_test("Available MSVC doesn't support App store\n") if msvc_140: @@ -128,8 +129,25 @@ print('env[MSVC_VERSION]=%s' % env.get('MSVC_VERSION')) test.fail_test((vclibstore_path_present is True) or (vclibstorerefs_path_present is True), message='VC Store LIBPATHs present when MSVC_UWP_APP not set (msvc_version=%s)' % msvc_version) -if msvc_141 or msvc_142: - if msvc_142: +if msvc_141 or msvc_142 or msvs_143: + if msvc_143: + test.write('SConstruct', """\ +if ARGUMENTS.get('MSVC_UWP_APP'): + help_vars = Variables() + help_vars.Add(EnumVariable( + 'MSVC_UWP_APP', + 'Build a Universal Windows Platform (UWP) Application', + '0', + allowed_values=('0', '1'))) +else: + help_vars = None +env = Environment(tools=['default', 'msvc'], variables=help_vars, MSVC_VERSION='14.3') +# Print the ENV LIBPATH to stdout +print('env[ENV][LIBPATH]=%s' % env.get('ENV').get('LIBPATH')) +print('env[MSVC_VERSION]=%s' % env.get('MSVC_VERSION')) +print('env[ENV][VSCMD_ARG_app_plat]=%s' % env.get('ENV').get('VSCMD_ARG_app_plat')) +""") + elif msvc_142: test.write('SConstruct', """\ if ARGUMENTS.get('MSVC_UWP_APP'): help_vars = Variables() |