[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5213-g97504ef

[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  97504efd2f2b776037184312b7af31e1b8c010cd (commit)
       via  bc6633d2e2c1323c9c142b6ed41124115ddee85f (commit)
      from  94b26502fb3585fbad420b042abd178da1cdea0e (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=97504efd2f2b776037184312b7af31e1b8c010cd
commit 97504efd2f2b776037184312b7af31e1b8c010cd
Merge: 94b2650 bc6633d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 17 12:29:52 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 17 12:29:52 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    bc6633d Diagnose bug.


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

    Diagnose bug.
    
    Presumably the dashboard machine does not use triples in the lib directories.

diff --git a/Tests/ToolchainSettings/Consumer/CMakeLists.txt b/Tests/ToolchainSettings/Consumer/CMakeLists.txt
index 139e14b..8040e18 100644
--- a/Tests/ToolchainSettings/Consumer/CMakeLists.txt
+++ b/Tests/ToolchainSettings/Consumer/CMakeLists.txt
@@ -12,6 +12,8 @@ foreach(_lang C CXX)
   endforeach()
 endforeach()
 
+message("CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES: ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}")
+
 find_package(ZLIB REQUIRED)
 set(CMAKE_CXX_LINK_FLAGS "-L\"${CMAKE_SYSROOT}/usr/lib/${triple}\"")
 

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

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


hooks/post-receive
-- 
CMake