[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5219-ga41a809

[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  a41a80917f1103671a84fe348f3d3924b53299d1 (commit)
       via  861c637019e7803f566a535e6a6d176d0ab3d49c (commit)
      from  93af3132297bdf231f916b77a361407c7623a905 (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=a41a80917f1103671a84fe348f3d3924b53299d1
commit a41a80917f1103671a84fe348f3d3924b53299d1
Merge: 93af313 861c637
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 17 13:05:43 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 17 13:05:43 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    861c637 shot in the dark.


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

    shot in the dark.

diff --git a/Tests/ToolchainSettings/CMakeLists.txt b/Tests/ToolchainSettings/CMakeLists.txt
index 6705655..cfab583 100644
--- a/Tests/ToolchainSettings/CMakeLists.txt
+++ b/Tests/ToolchainSettings/CMakeLists.txt
@@ -31,7 +31,8 @@ execute_process(COMMAND
   OUTPUT_VARIABLE triple
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
-if (NOT CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES MATCHES ${triple})
+
+if (triple AND NOT "${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}" MATCHES ${triple})
   set(triple)
 else()
   add_definitions(-DEXPECT_SHORT_LIBS=1)

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

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


hooks/post-receive
-- 
CMake