From 61ccd0e27a7b5c1b7288a791b24fc73cea4dfc08 Mon Sep 17 00:00:00 2001 From: Sverre Briseid Date: Mon, 23 Sep 2024 19:49:33 +0200 Subject: [PATCH] Fixed version issue for vs 2022. --- compositemodel/cmake/Modules/FindPugiXML.cmake | 2 +- trivariatemodel/cmake/Modules/FindPugiXML.cmake | 2 +- viewlib/cmake/Modules/FindJsonCpp.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compositemodel/cmake/Modules/FindPugiXML.cmake b/compositemodel/cmake/Modules/FindPugiXML.cmake index 41e2f771..3a2d3552 100644 --- 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 index 0a65ea82..8e325272 100644 --- 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 index eddc154c..a8f82a02 100644 --- 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!")