[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3811-g55d1f81

[Rolf Eike Beer]

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  55d1f814a32e11ce960c6d774724f92e23c9684a (commit)
       via  ab3deb26233b2546ba0a4aa59af961239a90d27d (commit)
      from  b0e33eaaf2c8aa2663cd64107f39c1dacd8e5b8e (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=55d1f814a32e11ce960c6d774724f92e23c9684a
commit 55d1f814a32e11ce960c6d774724f92e23c9684a
Merge: b0e33ea ab3deb2
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Aug 8 17:15:22 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 8 17:15:22 2013 -0400

    Merge topic 'cxx-flags' into next
    
    ab3deb2 CheckCXXCompilerFlag: add more XL and BCC expressions (#14339)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab3deb26233b2546ba0a4aa59af961239a90d27d
commit ab3deb26233b2546ba0a4aa59af961239a90d27d
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Aug 8 23:13:52 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Aug 8 23:13:52 2013 +0200

    CheckCXXCompilerFlag: add more XL and BCC expressions (#14339)

diff --git a/Modules/CheckCXXCompilerFlag.cmake b/Modules/CheckCXXCompilerFlag.cmake
index 5e8db03..5e08aaf 100644
--- a/Modules/CheckCXXCompilerFlag.cmake
+++ b/Modules/CheckCXXCompilerFlag.cmake
@@ -47,9 +47,11 @@ macro (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
      FAIL_REGEX "[Uu]nknown option"                         # HP
      FAIL_REGEX "[Ww]arning: [Oo]ption"                     # SunPro
      FAIL_REGEX "command option .* is not recognized"       # XL
+     FAIL_REGEX "command option .* contains an incorrect subargument" # XL
      FAIL_REGEX "not supported in this configuration; ignored"       # AIX
      FAIL_REGEX "File with unknown suffix passed to linker" # PGI
      FAIL_REGEX "WARNING: unknown flag:"                    # Open64
+     FAIL_REGEX "Incorrect command line option:"            # Borland
      )
    foreach(v ${_CheckCXXCompilerFlag_LOCALE_VARS})
      set(ENV{${v}} ${_CheckCXXCompilerFlag_SAVED_${v}})

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

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


hooks/post-receive
-- 
CMake