[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5217-g93af313

[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  93af3132297bdf231f916b77a361407c7623a905 (commit)
       via  e4b66a5dee3532b06070980d4b66964ddd3a587a (commit)
      from  b34a00913278991e5f0348cb2d8471e04a06bb4b (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=93af3132297bdf231f916b77a361407c7623a905
commit 93af3132297bdf231f916b77a361407c7623a905
Merge: b34a009 e4b66a5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 17 12:39:31 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 17 12:39:31 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    e4b66a5 Can't expect shortened libs.


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

    Can't expect shortened libs.

diff --git a/Tests/ToolchainSettings/CMakeLists.txt b/Tests/ToolchainSettings/CMakeLists.txt
index f9c0639..6705655 100644
--- a/Tests/ToolchainSettings/CMakeLists.txt
+++ b/Tests/ToolchainSettings/CMakeLists.txt
@@ -33,6 +33,8 @@ execute_process(COMMAND
 )
 if (NOT CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES MATCHES ${triple})
   set(triple)
+else()
+  add_definitions(-DEXPECT_SHORT_LIBS=1)
 endif()
 
 macro(write_make_script name)
diff --git a/Tests/ToolchainSettings/main.cpp b/Tests/ToolchainSettings/main.cpp
index 53282eb..64ea867 100644
--- a/Tests/ToolchainSettings/main.cpp
+++ b/Tests/ToolchainSettings/main.cpp
@@ -44,6 +44,7 @@ int main(void)
       else
         {
         gotLink = true;
+#ifdef EXPECT_SHORT_LIBS
         if (output.find("libz.so") != std::string::npos)
           {
           std::cout << "Unexpected library name: " << output << std::endl;
@@ -54,6 +55,13 @@ int main(void)
           std::cout << "Expected -lz: " << output << std::endl;
           return -1;
           }
+#else
+        if (output.find("libz.so") == std::string::npos)
+          {
+          std::cout << "Expected library name: " << output << std::endl;
+          return -1;
+          }
+#endif
         }
       }
     else if (output.find("-- Installing: ") != std::string::npos)

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

Summary of changes:
 Tests/ToolchainSettings/CMakeLists.txt |    2 ++
 Tests/ToolchainSettings/main.cpp       |    8 ++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake