diff options
| author | Christof Krüger <christof.krueger@gmail.com> | 2018-04-18 06:05:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-04-18 13:18:57 (GMT) |
| commit | bdf660cab5234aa5e533691b0fe03c0766c9a9f0 (patch) | |
| tree | 4c9e4346ed8deb5f7728f48d966b76f2ef161f32 /Modules/InstallRequiredSystemLibraries.cmake | |
| parent | fbe6cd1596bf280edd49aeb8f981f99d7cd8beb3 (diff) | |
| download | CMake-bdf660cab5234aa5e533691b0fe03c0766c9a9f0.zip CMake-bdf660cab5234aa5e533691b0fe03c0766c9a9f0.tar.gz CMake-bdf660cab5234aa5e533691b0fe03c0766c9a9f0.tar.bz2 | |
InstallRequiredSystemLibraries: Check for existence of mfcm dlls
Previously, only existence of `mfc${v}.dll` and `mfc${v}d.dll` variants
was checked and it was assumed that the managed variants `mfcm*.dll`
also existed. This assumption doesn't hold with Visual Studio 2017.
Check each file separately.
Fixes: #17913
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 797f9e4..eb17fd7 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -481,6 +481,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() @@ -495,6 +499,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() |