[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2392-gb6ff63c

[Stephen Kelly]

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  b6ff63c026213860441113278572a7d4ce103470 (commit)
       via  06068bbad415eb0624eaede1e2a7377edb42a897 (commit)
      from  ed08c7e69a4a1e896331a0588a4a1d3bd413e97b (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=b6ff63c026213860441113278572a7d4ce103470
commit b6ff63c026213860441113278572a7d4ce103470
Merge: ed08c7e 06068bb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 16 09:14:03 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 16 09:14:03 2014 -0400

    Merge topic 'cxx98-features' into next
    
    06068bba Continue only if the last test-compilation worked.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06068bbad415eb0624eaede1e2a7377edb42a897
commit 06068bbad415eb0624eaede1e2a7377edb42a897
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 16 15:12:06 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 16 15:13:33 2014 +0200

    Continue only if the last test-compilation worked.

diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 6ec3958..78d483c 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -34,6 +34,9 @@ macro(cmake_record_cxx_compile_features)
 
   if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
     _get_gcc_features(c++11 CMAKE_CXX11_COMPILE_FEATURES)
+    if (NOT _result EQUAL 0)
+      return()
+    endif()
     _get_gcc_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)
   else()
     set(_result 0)

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

Summary of changes:
 Modules/Compiler/GNU-CXX.cmake |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake