[Cmake-commits] CMake branch, next, updated. v3.1.0-1586-gfc5b691

[Stephen Kelly]

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  fc5b6913b9abee1e56568f380976c0d89abc4691 (commit)
       via  51b3fa391ff71b6aa5e5f0ad714f59adfd1d13dc (commit)
      from  9ee6a717826db91829196a59e02bcf73d216bf87 (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=fc5b6913b9abee1e56568f380976c0d89abc4691
commit fc5b6913b9abee1e56568f380976c0d89abc4691
Merge: 9ee6a71 51b3fa3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 8 17:16:57 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 8 17:16:57 2015 -0500

    Merge topic 'drop-ancient-workarounds' into next
    
    51b3fa39 Revert "Remove VS7 special case."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51b3fa391ff71b6aa5e5f0ad714f59adfd1d13dc
commit 51b3fa391ff71b6aa5e5f0ad714f59adfd1d13dc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 8 23:16:33 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jan 8 23:16:33 2015 +0100

    Revert "Remove VS7 special case."
    
    This reverts commit 73afe27ebd5bbd8ec0d316e0a951661d566ccc85.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 72a185f..96f4709 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -507,6 +507,11 @@ if(APPLE)
   target_link_libraries(CMakeLib "-framework CoreFoundation")
 endif()
 
+# On some platforms we need the rpcrt4 library for the VS 7 generators.
+if(CMAKE_BUILD_ON_VISUAL_STUDIO OR MINGW)
+  target_link_libraries(CMakeLib rpcrt4)
+endif()
+
 #
 # CTestLib
 #

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

Summary of changes:
 Source/CMakeLists.txt |    5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
CMake