From b8110d533f6357a8a4c4e878b4e687cb0c45fb1b Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Fri, 30 Aug 2024 15:25:25 -0400 Subject: [PATCH] Update conan to work for newer versions of MSVC --- cmake/conan-0.17.0.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/conan-0.17.0.cmake b/cmake/conan-0.17.0.cmake index d16f705af..96315021b 100644 --- a/cmake/conan-0.17.0.cmake +++ b/cmake/conan-0.17.0.cmake @@ -55,7 +55,9 @@ 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) + # Omniverse modification - 1940 was changed to 1945 + # This version of the conan-cmake script does not properly account for newer versions of MSVC + elseif(NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1945) set(${result} 17 PARENT_SCOPE) else() message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]")