Skip to content

Commit

Permalink
if this test runs with cmake 3.15 we have to lower to 191
Browse files Browse the repository at this point in the history
  • Loading branch information
czoido committed Oct 24, 2024
1 parent db795bb commit 979450e
Showing 1 changed file with 2 additions and 2 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 @@ -621,7 +621,7 @@ def test_cmake_toolchain_runtime_types_cmake_older_than_3_15():
@pytest.mark.skipif(platform.system() != "Windows", reason="Only for windows")
class TestWinSDKVersion:

@pytest.mark.tool("visual_studio", "17")
@pytest.mark.tool("visual_studio", "15")
def test_cmake_toolchain_winsdk_version(self):
# This test passes also with CMake 3.28, as long as cmake_minimum_required(VERSION 3.27)
# is not defined
Expand All @@ -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=194 "
client.run("create . -s arch=x86_64 -s compiler.version=191 "
"-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 Down

0 comments on commit 979450e

Please sign in to comment.