[Cmake-commits] CMake branch, next, updated. v2.8.3-534-g88fa033

[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  88fa0338050e3d0652c39c840a452b4c12e7c578 (commit)
       via  79e02333a6753dd92a58d704c04f18a6d9189523 (commit)
      from  26a5362f261c0f6d2a232994ad5a04b78faad486 (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=88fa0338050e3d0652c39c840a452b4c12e7c578
commit 88fa0338050e3d0652c39c840a452b4c12e7c578
Merge: 26a5362 79e0233
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 4 08:51:10 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 4 08:51:10 2010 -0400

    Merge topic 'CheckCompilerFlag-foreign-MSVC' into next
    
    79e0233 BUG: Fix compiler flag test for non-English MSVC (#11336)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=79e02333a6753dd92a58d704c04f18a6d9189523
commit 79e02333a6753dd92a58d704c04f18a6d9189523
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 4 08:49:06 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 4 08:50:17 2010 -0400

    BUG: Fix compiler flag test for non-English MSVC (#11336)
    
    Approach suggested by John Stark.

diff --git a/Modules/CheckCCompilerFlag.cmake b/Modules/CheckCCompilerFlag.cmake
index 0068617..cf519b1 100644
--- a/Modules/CheckCCompilerFlag.cmake
+++ b/Modules/CheckCCompilerFlag.cmake
@@ -7,7 +7,7 @@
 # that can modify the build.
 
 #=============================================================================
-# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006-2010 Kitware, Inc.
 # Copyright 2006 Alexander Neundorf <neundorf at kde.org>
 #
 # Distributed under the OSI-approved BSD License (the "License");
@@ -29,6 +29,7 @@ MACRO (CHECK_C_COMPILER_FLAG _FLAG _RESULT)
      # Some compilers do not fail with a bad flag
      FAIL_REGEX "unrecognized .*option"                     # GNU
      FAIL_REGEX "ignoring unknown option"                   # MSVC
+     FAIL_REGEX "warning D9002"                             # MSVC, any lang
      FAIL_REGEX "[Uu]nknown option"                         # HP
      FAIL_REGEX "[Ww]arning: [Oo]ption"                     # SunPro
      FAIL_REGEX "command option .* is not recognized"       # XL
diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake
index d8e4715..788bf35 100644
--- a/Modules/CheckCXXCompilerFlag.cmake
+++ b/Modules/CheckCXXCompilerFlag.cmake
@@ -7,7 +7,7 @@
 # modify the build.
 
 #=============================================================================
-# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006-2010 Kitware, Inc.
 # Copyright 2006 Alexander Neundorf <neundorf at kde.org>
 #
 # Distributed under the OSI-approved BSD License (the "License");
@@ -29,6 +29,7 @@ MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
      # Some compilers do not fail with a bad flag
      FAIL_REGEX "unrecognized .*option"                     # GNU
      FAIL_REGEX "ignoring unknown option"                   # MSVC
+     FAIL_REGEX "warning D9002"                             # MSVC, any lang
      FAIL_REGEX "[Uu]nknown option"                         # HP
      FAIL_REGEX "[Ww]arning: [Oo]ption"                     # SunPro
      FAIL_REGEX "command option .* is not recognized"       # XL

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

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


hooks/post-receive
-- 
CMake