diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-28 17:55:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-28 17:55:52 (GMT) |
| commit | 70d54b03fd4bae28fd2ff7fe9f3ede1dc50a994a (patch) | |
| tree | d95fac7352813c9e2dc6e4509f381c0977e9507c /Modules | |
| parent | 5b8c5a6c0bc072ebb79c77f30d2b073d7b9fe4ec (diff) | |
| parent | ff183986df719bfee0abd1f8c1e09dc348f04bd5 (diff) | |
| download | CMake-70d54b03fd4bae28fd2ff7fe9f3ede1dc50a994a.zip CMake-70d54b03fd4bae28fd2ff7fe9f3ede1dc50a994a.tar.gz CMake-70d54b03fd4bae28fd2ff7fe9f3ede1dc50a994a.tar.bz2 | |
Merge topic 'InstallRequiredSystemLibraries-fix-mbcs'
ff183986 InstallRequiredSystemLibraries: Fix MBCS MFC detection (#15531)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index c7e88ba..5509b28 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -324,11 +324,6 @@ if(MSVC) # Multi-Byte Character Set versions of MFC are available as optional # addon since Visual Studio 12. So for version 12 or higher, check # whether they are available and exclude them if they are not. - if("${v}" LESS 12 OR EXISTS "${MSVC${v}_MFC_DIR}/mfc${v}0d.dll") - set(mbcs ON) - else() - set(mbcs OFF) - endif() if(CMAKE_INSTALL_DEBUG_LIBRARIES) set(MSVC${v}_MFC_DIR @@ -337,7 +332,7 @@ if(MSVC) "${MSVC${v}_MFC_DIR}/mfc${v}0ud.dll" "${MSVC${v}_MFC_DIR}/mfcm${v}0ud.dll" ) - if(mbcs) + if("${v}" LESS 12 OR EXISTS "${MSVC${v}_MFC_DIR}/mfc${v}0d.dll") set(__install__libs ${__install__libs} "${MSVC${v}_MFC_DIR}/mfc${v}0d.dll" "${MSVC${v}_MFC_DIR}/mfcm${v}0d.dll" @@ -351,7 +346,7 @@ if(MSVC) "${MSVC${v}_MFC_DIR}/mfc${v}0u.dll" "${MSVC${v}_MFC_DIR}/mfcm${v}0u.dll" ) - if(mbcs) + if("${v}" LESS 12 OR EXISTS "${MSVC${v}_MFC_DIR}/mfc${v}0.dll") set(__install__libs ${__install__libs} "${MSVC${v}_MFC_DIR}/mfc${v}0.dll" "${MSVC${v}_MFC_DIR}/mfcm${v}0.dll" |