kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

InstallRequiredSystemLibraries: Fix MBCS MFC detection (#15531) 

Fix the logic added by commit v3.0.0-rc5~9^2
(InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12,
2014-05-06).  Do not test content of MSVC${v}_MFC_DIR until after the
variable is set.
This commit is contained in:
Bjoern Thiel 2015-04-24 05:12:00 -04:00 committed by Brad King
parent ebb54e02c4
commit ff183986df
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/InstallRequiredSystemLibraries.cmake
View File

@ -324,11 +324,6 @@ if(MSVC)
# Multi-Byte Character Set versions of MFC are available as optional # Multi-Byte Character Set versions of MFC are available as optional
# addon since Visual Studio 12. So for version 12 or higher, check # addon since Visual Studio 12. So for version 12 or higher, check
# whether they are available and exclude them if they are not. # 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) if(CMAKE_INSTALL_DEBUG_LIBRARIES)
set(MSVC${v}_MFC_DIR set(MSVC${v}_MFC_DIR
@ -337,7 +332,7 @@ if(MSVC)
"${MSVC${v}_MFC_DIR}/mfc${v}0ud.dll" "${MSVC${v}_MFC_DIR}/mfc${v}0ud.dll"
"${MSVC${v}_MFC_DIR}/mfcm${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} set(__install__libs ${__install__libs}
"${MSVC${v}_MFC_DIR}/mfc${v}0d.dll" "${MSVC${v}_MFC_DIR}/mfc${v}0d.dll"
"${MSVC${v}_MFC_DIR}/mfcm${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}/mfc${v}0u.dll"
"${MSVC${v}_MFC_DIR}/mfcm${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} set(__install__libs ${__install__libs}
"${MSVC${v}_MFC_DIR}/mfc${v}0.dll" "${MSVC${v}_MFC_DIR}/mfc${v}0.dll"
"${MSVC${v}_MFC_DIR}/mfcm${v}0.dll" "${MSVC${v}_MFC_DIR}/mfcm${v}0.dll"