Просмотр исходного кода

InstallRequiredSystemLibraries: Find VS 2017 Update 3 redist directory

Add compiler version 19.11 to our table.

Fixes: #17184
Brad King 8 лет назад
Родитель
Сommit
23cf9e152f
1 измененных файлов с 13 добавлено и 3 удалено
  1. 13 3
      Modules/InstallRequiredSystemLibraries.cmake

+ 13 - 3
Modules/InstallRequiredSystemLibraries.cmake

@@ -175,7 +175,11 @@ if(MSVC)
     endif()
   endif()
 
-  if(MSVC_VERSION EQUAL 1910)
+  if(MSVC_VERSION EQUAL 1911)
+    set(MSVC_REDIST_NAME VC141)
+    set(_MSVCRT_DLL_VERSION 140)
+    set(_MSVCRT_IDE_VERSION 15)
+  elseif(MSVC_VERSION EQUAL 1910)
     set(MSVC_REDIST_NAME VC150)
     set(_MSVCRT_DLL_VERSION 140)
     set(_MSVCRT_IDE_VERSION 15)
@@ -393,7 +397,10 @@ if(MSVC)
         )
     endif()
 
-    if(MSVC_VERSION EQUAL 1910)
+    if(MSVC_VERSION EQUAL 1911)
+      set(_MFC_DLL_VERSION 140)
+      set(_MFC_IDE_VERSION 15)
+    elseif(MSVC_VERSION EQUAL 1910)
       set(_MFC_DLL_VERSION 140)
       set(_MFC_IDE_VERSION 15)
     elseif(MSVC_VERSION EQUAL 1900)
@@ -481,7 +488,10 @@ if(MSVC)
   # MSVC 8 was the first version with OpenMP
   # Furthermore, there is no debug version of this
   if(CMAKE_INSTALL_OPENMP_LIBRARIES)
-    if(MSVC_VERSION EQUAL 1910)
+    if(MSVC_VERSION EQUAL 1911)
+      set(_MSOMP_DLL_VERSION 140)
+      set(_MSOMP_IDE_VERSION 15)
+    elseif(MSVC_VERSION EQUAL 1910)
       set(_MSOMP_DLL_VERSION 140)
       set(_MSOMP_IDE_VERSION 15)
     elseif(MSVC_VERSION EQUAL 1900)