From ff183986df719bfee0abd1f8c1e09dc348f04bd5 Mon Sep 17 00:00:00 2001
From: Bjoern Thiel <bthiel@gwdg.de>
Date: Fri, 24 Apr 2015 05:12:00 -0400
Subject: 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.
---
 Modules/InstallRequiredSystemLibraries.cmake | 9 ++-------
 1 file 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"
-- 
cgit v0.12