[Cmake-commits] CMake branch, next, updated. v2.8.6-2313-ga719919

[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  a719919e4b447b0fbc93de96329ae5be75ecf7a5 (commit)
       via  646cf9193213367b833b7681c3ad7beed1ea946c (commit)
      from  e2477cf65161c46c377419a231c3371437630285 (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=a719919e4b447b0fbc93de96329ae5be75ecf7a5
commit a719919e4b447b0fbc93de96329ae5be75ecf7a5
Merge: e2477cf 646cf91
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 22 09:41:29 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 22 09:41:29 2011 -0500

    Merge topic 'CheckCCompilerFlag-issue-12633' into next
    
    646cf91 CheckCCompilerFlag: Generalize "but not for C" case (#12633)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=646cf9193213367b833b7681c3ad7beed1ea946c
commit 646cf9193213367b833b7681c3ad7beed1ea946c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 22 09:39:25 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 22 09:40:32 2011 -0500

    CheckCCompilerFlag: Generalize "but not for C" case (#12633)
    
    The "warning: " part is not necessary.  The case can happen on any GNU
    compiler, not just an Apple version.

diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake
index ec0a773..5380f4d 100644
--- a/Modules/CheckCCompilerFlag.cmake
+++ b/Modules/CheckCCompilerFlag.cmake
@@ -7,7 +7,7 @@
 # that can modify the build.
 
 #=============================================================================
-# Copyright 2006-2010 Kitware, Inc.
+# Copyright 2006-2011 Kitware, Inc.
 # Copyright 2006 Alexander Neundorf <neundorf at kde.org>
 #
 # Distributed under the OSI-approved BSD License (the "License");
@@ -27,8 +27,7 @@ MACRO (CHECK_C_COMPILER_FLAG _FLAG _RESULT)
    SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
    CHECK_C_SOURCE_COMPILES("int main(void) { return 0; }" ${_RESULT}
      # Some compilers do not fail with a bad flag
-     FAIL_REGEX "warning: command line option .* is valid for .* but not for C"
-                                                            # Apple gcc
+     FAIL_REGEX "command line option .* is valid for .* but not for C" # GNU
      FAIL_REGEX "unrecognized .*option"                     # GNU
      FAIL_REGEX "unknown .*option"                          # Clang
      FAIL_REGEX "ignoring unknown option"                   # MSVC

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

Summary of changes:
 Modules/CheckCCompilerFlag.cmake |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake