[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5215-gb34a009

[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  b34a00913278991e5f0348cb2d8471e04a06bb4b (commit)
       via  b35299d66376c1ed2de385942e57c8e325e5bcc4 (commit)
      from  97504efd2f2b776037184312b7af31e1b8c010cd (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=b34a00913278991e5f0348cb2d8471e04a06bb4b
commit b34a00913278991e5f0348cb2d8471e04a06bb4b
Merge: 97504ef b35299d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 17 12:32:42 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 17 12:32:42 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    b35299d Clear triple if not used.


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

    Clear triple if not used.

diff --git a/Tests/ToolchainSettings/CMakeLists.txt b/Tests/ToolchainSettings/CMakeLists.txt
index 3f8f8df..f9c0639 100644
--- a/Tests/ToolchainSettings/CMakeLists.txt
+++ b/Tests/ToolchainSettings/CMakeLists.txt
@@ -31,6 +31,9 @@ execute_process(COMMAND
   OUTPUT_VARIABLE triple
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
+if (NOT CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES MATCHES ${triple})
+  set(triple)
+endif()
 
 macro(write_make_script name)
   file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.sh"

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

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


hooks/post-receive
-- 
CMake