diff options
author | Brad King <brad.king@kitware.com> | 2018-04-19 12:24:32 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-19 12:24:40 (GMT) |
commit | 423de692f91fada3b060359dd52608de29ac3a3a (patch) | |
tree | ddac3d4975dcd328a6d585c824ed3ec174af00ca /Modules/InstallRequiredSystemLibraries.cmake | |
parent | c4a2059eae1473db68fad8980d15d8200cc3e739 (diff) | |
parent | bdf660cab5234aa5e533691b0fe03c0766c9a9f0 (diff) | |
download | CMake-423de692f91fada3b060359dd52608de29ac3a3a.zip CMake-423de692f91fada3b060359dd52608de29ac3a3a.tar.gz CMake-423de692f91fada3b060359dd52608de29ac3a3a.tar.bz2 |
Merge topic 'InstallRequiredSystemLibraries-mfcm'
bdf660cab5 InstallRequiredSystemLibraries: Check for existence of mfcm dlls
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1980
Diffstat (limited to 'Modules/InstallRequiredSystemLibraries.cmake')
-rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 50e9361..0fd76c0 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -460,6 +460,10 @@ if(MSVC) if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfc${v}d.dll") set(__install__libs ${__install__libs} "${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" ) endif() @@ -474,6 +478,10 @@ if(MSVC) if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfc${v}.dll") set(__install__libs ${__install__libs} "${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" ) endif() |