[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5211-g94b2650

[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  94b26502fb3585fbad420b042abd178da1cdea0e (commit)
       via  1ebe6fe9f7fc7a252844a102561a2afcee7782b9 (commit)
      from  8860d91851b7962ec0b995220c5920af08c0cd71 (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=94b26502fb3585fbad420b042abd178da1cdea0e
commit 94b26502fb3585fbad420b042abd178da1cdea0e
Merge: 8860d91 1ebe6fe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 17 12:05:54 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 17 12:05:54 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    1ebe6fe Fix libz.so.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ebe6fe9f7fc7a252844a102561a2afcee7782b9
commit 1ebe6fe9f7fc7a252844a102561a2afcee7782b9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 17 18:05:16 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Nov 17 18:05:16 2013 +0100

    Fix libz.so.

diff --git a/Tests/ToolchainSettings/main.cpp b/Tests/ToolchainSettings/main.cpp
index 2460d23..53282eb 100644
--- a/Tests/ToolchainSettings/main.cpp
+++ b/Tests/ToolchainSettings/main.cpp
@@ -44,7 +44,7 @@ int main(void)
       else
         {
         gotLink = true;
-        if (output.find("zlib.so") != std::string::npos)
+        if (output.find("libz.so") != std::string::npos)
           {
           std::cout << "Unexpected library name: " << output << std::endl;
           return -1;

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

Summary of changes:
 Tests/ToolchainSettings/main.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake