[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2779-g493256e

[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  493256e1d3f12b16229340576566dab864d22317 (commit)
       via  c0a6646d2fdff6ccd6f217096d60a9f004c14b51 (commit)
      from  56fb699267c03f4d7fd9de86328aad906df8fcde (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=493256e1d3f12b16229340576566dab864d22317
commit 493256e1d3f12b16229340576566dab864d22317
Merge: 56fb699 c0a6646
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 6 10:00:01 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 10:00:01 2014 -0400

    Merge topic 'InstallRequiredSystemLibraries-vs12-mfc' into next
    
    c0a6646d InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12 (#14903)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0a6646d2fdff6ccd6f217096d60a9f004c14b51
commit c0a6646d2fdff6ccd6f217096d60a9f004c14b51
Author:     Felix Krause <felix.krause at devoteam.com>
AuthorDate: Tue May 6 08:27:59 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 6 08:54:39 2014 -0400

    InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12 (#14903)
    
    The MBCS (Multi-Byte Character Set) has been deprecated with VS 2013,
    and MSVC no longer ships with an MBCS-version of MFC by default.
    However, it can be downloaded as an add-on.
    
    Teach InstallRequiredSystemLibraries to install the MBCS MFC only
    for VS < 12 or if it happens to exist on the system.

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 013a028..86033e6 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -295,25 +295,42 @@ if(MSVC)
     macro(MFC_FILES_FOR_VERSION version)
       set(v "${version}")
 
+      # 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
           "${MSVC${v}_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.DebugMFC")
         set(__install__libs ${__install__libs}
-          "${MSVC${v}_MFC_DIR}/mfc${v}0d.dll"
           "${MSVC${v}_MFC_DIR}/mfc${v}0ud.dll"
-          "${MSVC${v}_MFC_DIR}/mfcm${v}0d.dll"
           "${MSVC${v}_MFC_DIR}/mfcm${v}0ud.dll"
           )
+        if(mbcs)
+          set(__install__libs ${__install__libs}
+            "${MSVC${v}_MFC_DIR}/mfc${v}0d.dll"
+            "${MSVC${v}_MFC_DIR}/mfcm${v}0d.dll"
+          )
+        endif()
       endif()
 
       set(MSVC${v}_MFC_DIR "${MSVC${v}_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.MFC")
       if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
         set(__install__libs ${__install__libs}
-          "${MSVC${v}_MFC_DIR}/mfc${v}0.dll"
           "${MSVC${v}_MFC_DIR}/mfc${v}0u.dll"
-          "${MSVC${v}_MFC_DIR}/mfcm${v}0.dll"
           "${MSVC${v}_MFC_DIR}/mfcm${v}0u.dll"
           )
+        if(mbcs)
+          set(__install__libs ${__install__libs}
+            "${MSVC${v}_MFC_DIR}/mfc${v}0.dll"
+            "${MSVC${v}_MFC_DIR}/mfcm${v}0.dll"
+          )
+        endif()
       endif()
 
       # include the language dll's as well as the actuall dll's

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

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake