[Cmake-commits] CMake branch, next, updated. v2.8.6-1570-g49c1cf5

[Alexander Neundorf]

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  49c1cf5cd65752a6a28591b9dd9f4b6a0ab220e8 (commit)
       via  0d44ce2bf4ced68e6d61b1733002988e0a8e6a40 (commit)
       via  83e4a45609ef436d032b3c527bce9b0382cfe329 (commit)
      from  f872eb8c94dc50787192e0e23d570ee494788ae8 (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=49c1cf5cd65752a6a28591b9dd9f4b6a0ab220e8
commit 49c1cf5cd65752a6a28591b9dd9f4b6a0ab220e8
Merge: f872eb8 0d44ce2
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Oct 12 16:24:49 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 12 16:24:49 2011 -0400

    Merge topic 'SilentMakeOutputOnBSD' into next
    
    0d44ce2 Silence make on OpenBSD in FindPackageModeTest(#12508)
    83e4a45 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d44ce2bf4ced68e6d61b1733002988e0a8e6a40
commit 0d44ce2bf4ced68e6d61b1733002988e0a8e6a40
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Oct 12 22:20:18 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Oct 12 22:20:18 2011 +0200

    Silence make on OpenBSD in FindPackageModeTest(#12508)
    
    BSD make doesn't use -v for printing its name and version, and so
    complains on stderr that this is a bad command line option, used
    in Tests/FindPackageModeMakefileTest/CMakeLists.txt .
    Silence stderr to make that ugly output go away.
    Patch by David Coppy.
    
    Alex

diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
index def8d63..3674f0e 100644
--- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
@@ -7,6 +7,7 @@ if(UNIX  AND  "${CMAKE_GENERATOR}" MATCHES "Makefile")
   # is AFAIK a GNU make extension. Alex
   execute_process(COMMAND ${CMAKE_MAKE_PROGRAM} -v
                   OUTPUT_VARIABLE makeVersionOutput
+                  ERROR_QUIET
                   TIMEOUT 10)
   string(TOUPPER "${makeVersionOutput}" MAKE_VERSION_OUTPUT)
   if("${MAKE_VERSION_OUTPUT}" MATCHES ".*GNU MAKE.*")

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

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake                |    2 +-
 Tests/FindPackageModeMakefileTest/CMakeLists.txt |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake