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

Merge branch 'InstallRequiredSystemLibraries-mfcm' into release-3.11

Merge-request: !1980
Brad King 7 лет назад
Родитель
Сommit
c86386caa3
1 измененных файлов с 8 добавлено и 0 удалено
  1. 8 0
      Modules/InstallRequiredSystemLibraries.cmake

+ 8 - 0
Modules/InstallRequiredSystemLibraries.cmake

@@ -481,6 +481,10 @@ if(MSVC)
         if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfc${v}d.dll")
         if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfc${v}d.dll")
           set(__install__libs ${__install__libs}
           set(__install__libs ${__install__libs}
             "${MSVC_MFC_DIR}/mfc${v}d.dll"
             "${MSVC_MFC_DIR}/mfc${v}d.dll"
+          )
+        endif()
+        if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfcm${v}d.dll")
+          set(__install__libs ${__install__libs}
             "${MSVC_MFC_DIR}/mfcm${v}d.dll"
             "${MSVC_MFC_DIR}/mfcm${v}d.dll"
           )
           )
         endif()
         endif()
@@ -495,6 +499,10 @@ if(MSVC)
         if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfc${v}.dll")
         if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfc${v}.dll")
           set(__install__libs ${__install__libs}
           set(__install__libs ${__install__libs}
             "${MSVC_MFC_DIR}/mfc${v}.dll"
             "${MSVC_MFC_DIR}/mfc${v}.dll"
+          )
+        endif()
+        if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfcm${v}.dll")
+          set(__install__libs ${__install__libs}
             "${MSVC_MFC_DIR}/mfcm${v}.dll"
             "${MSVC_MFC_DIR}/mfcm${v}.dll"
           )
           )
         endif()
         endif()