Merge pull request SINTEF-Geometry#364 from sbriseid/vs2022_fix

Fixed version issue for vs 2022.
sbriseid · Sep 23, 2024 · 0a3b251 · 0a3b251
2 parents d2d2137 + 61ccd0e
commit 0a3b251
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/compositemodel/cmake/Modules/FindPugiXML.cmake b/compositemodel/cmake/Modules/FindPugiXML.cmake
@@ -30,7 +30,7 @@ if(WIN32)
   elseif((${MSVC_VERSION} GREATER_EQUAL 1920) AND (${MSVC_VERSION} LESS 1930))
     # MESSAGE("Visual Studio 2019!")
     set(MSVC_NAME "msvc2019_")
-  elseif((${MSVC_VERSION} GREATER_EQUAL 1930) AND (${MSVC_VERSION} LESS 1940))
+  elseif((${MSVC_VERSION} GREATER_EQUAL 1930) AND (${MSVC_VERSION} LESS 1950))
     set(MSVC_NAME "msvc2022_")
   else()
     message("MSVC version not supported or not installed!")

diff --git a/trivariatemodel/cmake/Modules/FindPugiXML.cmake b/trivariatemodel/cmake/Modules/FindPugiXML.cmake
@@ -30,7 +30,7 @@ if(WIN32)
   elseif((${MSVC_VERSION} GREATER_EQUAL 1920) AND (${MSVC_VERSION} LESS 1930))
     # MESSAGE("Visual Studio 2019!")
     set(MSVC_NAME "msvc2019_")
-  elseif((${MSVC_VERSION} GREATER_EQUAL 1930) AND (${MSVC_VERSION} LESS 1940))
+  elseif((${MSVC_VERSION} GREATER_EQUAL 1930) AND (${MSVC_VERSION} LESS 1950))
     set(MSVC_NAME "msvc2022_")
   else()
     message("MSVC version not supported or not installed!")

diff --git a/viewlib/cmake/Modules/FindJsonCpp.cmake b/viewlib/cmake/Modules/FindJsonCpp.cmake
@@ -22,7 +22,7 @@ if(WIN32)
   elseif((${MSVC_VERSION} GREATER_EQUAL 1920) AND (${MSVC_VERSION} LESS 1930))
     # MESSAGE("Visual Studio 2019!")
     set(MSVC_NAME "msvc2019_")
-  elseif((${MSVC_VERSION} GREATER_EQUAL 1930) AND (${MSVC_VERSION} LESS 1940))
+  elseif((${MSVC_VERSION} GREATER_EQUAL 1930) AND (${MSVC_VERSION} LESS 1950))
     set(MSVC_NAME "msvc2022_")
   else()
     message("MSVC version not supported or not installed!")