Update conan to work for newer versions of MSVC

CesiumGS · Aug 30, 2024 · c2bf6e9 · c2bf6e9
1 parent bbdee2b
commit c2bf6e9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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}]")