[Cmake-commits] CMake branch, next, updated. v3.2.2-2198-g64d4bb4

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  64d4bb4b386200e6ffcea1267e62759d45c71ada (commit)
       via  ff183986df719bfee0abd1f8c1e09dc348f04bd5 (commit)
      from  5a3b315a23b15ec8931c171b396ed105a8a39976 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64d4bb4b386200e6ffcea1267e62759d45c71ada
commit 64d4bb4b386200e6ffcea1267e62759d45c71ada
Merge: 5a3b315 ff18398
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 27 10:12:29 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 27 10:12:29 2015 -0400

    Merge topic 'InstallRequiredSystemLibraries-fix-mbcs' into next
    
    ff183986 InstallRequiredSystemLibraries: Fix MBCS MFC detection (#15531)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff183986df719bfee0abd1f8c1e09dc348f04bd5
commit ff183986df719bfee0abd1f8c1e09dc348f04bd5
Author:     Bjoern Thiel <bthiel at gwdg.de>
AuthorDate: Fri Apr 24 05:12:00 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 27 10:09:38 2015 -0400

    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.

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"

-----------------------------------------------------------------------

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake