Skip to content

Commit

Permalink
use 194 instead of 193 as we have vs 17.11 v144 installed
Browse files Browse the repository at this point in the history
  • Loading branch information
czoido committed Oct 24, 2024
1 parent c99a1b8 commit 3237ab1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions test/functional/toolchains/cmake/test_cmake_toolchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ def test_cmake_toolchain_winsdk_version(self):
cmake += 'message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = ' \
'${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")'
client.save({"CMakeLists.txt": cmake})
client.run("create . -s arch=x86_64 -s compiler.version=193 "
client.run("create . -s arch=x86_64 -s compiler.version=194 "
"-c tools.microsoft:winsdk_version=10.0")
assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 10.0" in client.out
assert "Conan toolchain: CMAKE_GENERATOR_PLATFORM=x64" in client.out
Expand All @@ -649,7 +649,7 @@ def test_cmake_toolchain_winsdk_version2(self):
cmake += 'message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = ' \
'${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")'
client.save({"CMakeLists.txt": cmake})
client.run("create . -s arch=x86_64 -s compiler.version=193 "
client.run("create . -s arch=x86_64 -s compiler.version=194 "
"-c tools.microsoft:winsdk_version=10.0 "
'-c tools.cmake.cmaketoolchain:generator="Visual Studio 17"')
assert "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION = 10.0" in client.out
Expand Down
2 changes: 1 addition & 1 deletion test/functional/toolchains/microsoft/test_vcvars.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class TestConan(ConanFile):
settings = "os", "compiler", "arch", "build_type"
""")
client.save({"conanfile.py": conanfile})
client.run('install . -s compiler.version=193')
client.run('install . -s compiler.version=194')
client.run_command(r'conanbuild.bat')
assert "[vcvarsall.bat] Environment initialized" in client.out
client.run_command(r'deactivate_conanvcvars.bat')
Expand Down

0 comments on commit 3237ab1

Please sign in to comment.