Merge branch 'feat_visp_namespace' into feat_disable_miniz

fspindle · Jun 6, 2024 · 7c57604 · 7c57604
2 parents 2d1d13d + 076f306
commit 7c57604
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmake/FindVirtuose.cmake b/cmake/FindVirtuose.cmake
@@ -82,7 +82,7 @@ elseif(MSVC)
     set(VIRTUOSE_MSVC_RUNTIME VC2017)
   elseif(MSVC_VERSION MATCHES "^192[0-9]$")
     set(VIRTUOSE_MSVC_RUNTIME VC2019)
-  elseif(MSVC_VERSION MATCHES "^193[0-9]$")
+  elseif(MSVC_VERSION MATCHES "^19[34][0-9]$")
     set(VIRTUOSE_MSVC_RUNTIME VC2022)
   endif()
 

diff --git a/cmake/templates/VISPConfig.root-WIN32.cmake.in b/cmake/templates/VISPConfig.root-WIN32.cmake.in
@@ -154,7 +154,7 @@ elseif(MSVC)
         set(VISP_RUNTIME vc14) # selecting previous compatible runtime version
       endif()
     endif()
-  elseif(MSVC_VERSION MATCHES "^193[0-9]$")
+  elseif(MSVC_VERSION MATCHES "^19[34][0-9]$")
     set(VISP_RUNTIME vc17)
     check_one_config(has_VS2022)
     if(NOT has_VS2022)