From d9b426f8de93de12e1acf5f4a061fbf6c8b24910 Mon Sep 17 00:00:00 2001 From: Christiaan Arnoldus Date: Wed, 22 May 2024 13:19:31 +0200 Subject: [PATCH 1/2] Fix _get_msvc_ide_version for VS17.10 Visual Studio 17.10 was just released with MSVC version 1940, which gives an error: "Unknown MSVC compiler version" https://learn.microsoft.com/sl-si/cpp/overview/compiler-versions?view=msvc-170 --- conan.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conan.cmake b/conan.cmake index 59ac49dd..897955c2 100644 --- a/conan.cmake +++ b/conan.cmake @@ -55,7 +55,7 @@ function(_get_msvc_ide_version result) set(${result} 15 PARENT_SCOPE) elseif(NOT MSVC_VERSION VERSION_LESS 1920 AND MSVC_VERSION VERSION_LESS 1930) set(${result} 16 PARENT_SCOPE) - elseif(NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1940) + elseif(NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1941) set(${result} 17 PARENT_SCOPE) else() message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]") From 6e5369d13720f22e07e31bb6b9018dbe60529fea Mon Sep 17 00:00:00 2001 From: Christiaan Arnoldus Date: Fri, 24 May 2024 00:59:01 +0200 Subject: [PATCH 2/2] Raise MSVC_VERSION all the way to 1950 Co-authored-by: Kevin Puetz --- conan.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conan.cmake b/conan.cmake index 897955c2..abfe7db7 100644 --- a/conan.cmake +++ b/conan.cmake @@ -55,7 +55,7 @@ function(_get_msvc_ide_version result) set(${result} 15 PARENT_SCOPE) elseif(NOT MSVC_VERSION VERSION_LESS 1920 AND MSVC_VERSION VERSION_LESS 1930) set(${result} 16 PARENT_SCOPE) - elseif(NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1941) + elseif(NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1950) set(${result} 17 PARENT_SCOPE) else() message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]")