[Cmake-commits] CMake branch, next, updated. v3.0.0-3771-g6d94c89

[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  6d94c89da1f56e08b8439f2b4377c153d8833b36 (commit)
       via  15a19c31e51a43379929cfd948111f4f2fba1584 (commit)
      from  f8707babfdda369b82260c53b0ee064901795586 (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=6d94c89da1f56e08b8439f2b4377c153d8833b36
commit 6d94c89da1f56e08b8439f2b4377c153d8833b36
Merge: f8707ba 15a19c3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 16 15:35:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 16 15:35:28 2014 -0400

    Merge topic 'InstallRequiredSystemLibraries-repeat' into next
    
    15a19c31 InstallRequiredSystemLibraries: Allow repeat use per-config


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15a19c31e51a43379929cfd948111f4f2fba1584
commit 15a19c31e51a43379929cfd948111f4f2fba1584
Author:     Bjoern Thiel <bjoern.thiel at mpibpc.mpg.de>
AuthorDate: Mon Jun 16 06:13:47 2014 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 16 15:36:25 2014 -0400

    InstallRequiredSystemLibraries: Allow repeat use per-config
    
    To be able to include InstallRequiredSystemLibraries more than once
    (e.g. to get the Debug and Release libraries separately), clear the
    internal library list for non-matching configuration.

diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 5c439e9..2fc8c04 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -94,6 +94,8 @@ if(MSVC)
         "${MSVC80_CRT_DIR}/msvcp80.dll"
         "${MSVC80_CRT_DIR}/msvcr80.dll"
         )
+    else()
+      set(__install__libs)
     endif()
 
     if(CMAKE_INSTALL_DEBUG_LIBRARIES)
@@ -132,6 +134,8 @@ if(MSVC)
         "${MSVC90_CRT_DIR}/msvcp90.dll"
         "${MSVC90_CRT_DIR}/msvcr90.dll"
         )
+    else()
+      set(__install__libs)
     endif()
 
     if(CMAKE_INSTALL_DEBUG_LIBRARIES)
@@ -168,6 +172,8 @@ if(MSVC)
         "${MSVC${v}_CRT_DIR}/msvcp${v}0.dll"
         "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll"
         )
+    else()
+      set(__install__libs)
     endif()
 
     if(CMAKE_INSTALL_DEBUG_LIBRARIES)

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

Summary of changes:
 Modules/InstallRequiredSystemLibraries.cmake |    6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
CMake