[Cmake-commits] CMake branch, next, updated. v3.2.2-2476-ga7850c5

[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  a7850c5498db008be536da8cddb72724743f9011 (commit)
       via  9b2778d412351db9c8c7f667335cbdf51b555124 (commit)
      from  cab41d4b45334f527c33f0c5daa3ee49a5afb67b (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=a7850c5498db008be536da8cddb72724743f9011
commit a7850c5498db008be536da8cddb72724743f9011
Merge: cab41d4 9b2778d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 4 12:36:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 4 12:36:33 2015 -0400

    Merge topic 'InstallRequiredSystemLibraries-vs2015' into next
    
    9b2778d4 InstallRequiredSystemLibraries: Update for VS 2015 (#15552)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b2778d412351db9c8c7f667335cbdf51b555124
commit 9b2778d412351db9c8c7f667335cbdf51b555124
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 4 11:57:42 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 4 12:36:12 2015 -0400

    InstallRequiredSystemLibraries: Update for VS 2015 (#15552)
    
    The part of the MS C Runtime library that applications need to
    distribute has been renamed from "msvcr*.dll" to "vcruntime*.dll"
    starting with VS 2015.  See the Visual C++ Team Blog:
    
     Introducing the Universal CRT
     http://blogs.msdn.com/b/vcblog/archive/2015/03/03/introducing-the-universal-crt.aspx

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 5afb517..d8ede1c 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -172,8 +172,12 @@ if(MSVC)
     if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
       set(__install__libs
         "${MSVC${v}_CRT_DIR}/msvcp${v}0.dll"
-        "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll"
         )
+      if(NOT v VERSION_LESS 14)
+        list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0.dll")
+      else()
+        list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll")
+      endif()
     else()
       set(__install__libs)
     endif()
@@ -183,8 +187,12 @@ if(MSVC)
         "${MSVC${v}_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.DebugCRT")
       set(__install__libs ${__install__libs}
         "${MSVC${v}_CRT_DIR}/msvcp${v}0d.dll"
-        "${MSVC${v}_CRT_DIR}/msvcr${v}0d.dll"
         )
+      if(NOT v VERSION_LESS 14)
+        list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0d.dll")
+      else()
+        list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0d.dll")
+      endif()
     endif()
   endmacro()
 

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

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


hooks/post-receive
-- 
CMake