[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3831-gd05a8d1

[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  d05a8d19e5cb3983cc215eb6b375f929b8716b13 (commit)
       via  d0bfc5b46eaf5afdc31c757012a4eb3b82a0a962 (commit)
      from  caec09261ace95094b47ffbf775984d58fd6837b (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=d05a8d19e5cb3983cc215eb6b375f929b8716b13
commit d05a8d19e5cb3983cc215eb6b375f929b8716b13
Merge: caec092 d0bfc5b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Aug 9 14:33:21 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 9 14:33:21 2013 -0400

    Merge topic 'cxx11' into next
    
    d0bfc5b CXXFeatures: blacklist Borland and Watcom for C++11 compiler flag detection


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0bfc5b46eaf5afdc31c757012a4eb3b82a0a962
commit d0bfc5b46eaf5afdc31c757012a4eb3b82a0a962
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Aug 9 20:27:53 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Aug 9 20:29:07 2013 +0200

    CXXFeatures: blacklist Borland and Watcom for C++11 compiler flag detection
    
    These compilers do not have a C++11 flag, but check_cxx_compiler_flag()
    can't detect because they either will not always complain (Borland) or will
    hang (Watcom).

diff --git a/Modules/FindCXXFeatures.cmake b/Modules/FindCXXFeatures.cmake
index 6b35291..5599998 100644
--- a/Modules/FindCXXFeatures.cmake
+++ b/Modules/FindCXXFeatures.cmake
@@ -50,6 +50,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "XL")
     if (_HAS_CXX0X_FLAG)
         set(CXX11_COMPILER_FLAGS "-qlanglvl=extended0x")
     endif ()
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "(Borland|Watcom)")
+    # No C++11 flag for those compilers, but check_cxx_compiler_flag()
+    # can't detect because they either will not always complain (Borland)
+    # or will hang (Watcom).
 else ()
     check_cxx_compiler_flag("-std=c++11" _HAS_CXX11_FLAG)
     if (_HAS_CXX11_FLAG)

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

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


hooks/post-receive
-- 
CMake