[Cmake-commits] CMake branch, next, updated. v3.6.0-962-gd5be5b5

[Brad King]

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  d5be5b5f444f165229cfd699eed28fe25bff4342 (commit)
       via  d6a6024e9eb993d94d24bb0d98f966c50079a525 (commit)
      from  7b67f599ae400030ec5f833a7c681bdfab4b71a8 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5be5b5f444f165229cfd699eed28fe25bff4342
commit d5be5b5f444f165229cfd699eed28fe25bff4342
Merge: 7b67f59 d6a6024
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 21 15:40:26 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 21 15:40:26 2016 -0400

    Merge topic 'tests-hide-ldd-check-errors' into next
    
    d6a6024e Tests: Hide errors from `ldd --help` output check


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6a6024e9eb993d94d24bb0d98f966c50079a525
commit d6a6024e9eb993d94d24bb0d98f966c50079a525
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 21 15:38:47 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 21 15:39:05 2016 -0400

    Tests: Hide errors from `ldd --help` output check
    
    If `--help` is not a valid option then it may print content to stderr,
    so we need to capture that.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index b6d1c38..dbd5530 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -309,7 +309,8 @@ endif()
 if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   if(UNIX AND NOT CYGWIN)
     execute_process(COMMAND ldd --help
-      OUTPUT_VARIABLE LDD_HELP)
+      OUTPUT_VARIABLE LDD_HELP
+      ERROR_VARIABLE LDD_ERR)
     if("${LDD_HELP}" MATCHES
         "(-r, --function-relocs.*process data and function relocations.*-u, --unused.*print unused direct dependencies)")
       add_RunCMake_test(LinkWhatYouUse)

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake